diff --git a/scripts/process-git-requests/process-git-requests b/scripts/process-git-requests/process-git-requests
index 2145905..24ae550 100755
--- a/scripts/process-git-requests/process-git-requests
+++ b/scripts/process-git-requests/process-git-requests
@@ -3,7 +3,7 @@ VERSION = "1.0"
 
 # Unfortunately pkgdb can't tell us when we stop accepting branches for the
 # oldest supported release, so this needs updating manually.
-OBSOLETE_BRANCH='f17'
+OBSOLETE_BRANCH='f18'
 
 # A bug for testing new types of badly formatted requests exists:
 # https://bugzilla.redhat.com/show_bug.cgi?id=622067
@@ -282,7 +282,9 @@ def clean_branches(branches):
     branches = re.sub(r'devel', ' ', branches)
     branches = re.sub(r'master', ' ', branches)
     branches = re.sub(r'f-([1-9][0-9])', r'f\1', branches)
-    branches = re.sub(r'el-([1-9])', r'el\1', branches)
+    branches = re.sub(r'el-([1-6])', r'el\1', branches)
+    branches = re.sub(r'el-([7-9])', r'epel\1', branches)
+    branches = re.sub(r'epel-([1-9])', r'epel\1', branches)
     branches = re.sub(r' +', ' ', branches)
 
     # Now make things nasty to satisfy history