diff --git a/lib/config.json b/lib/config.json
index 51cdbf6..54cb844 100644
--- a/lib/config.json
+++ b/lib/config.json
@@ -115,14 +115,6 @@
 		     "slavenames" : [ "fedora-x86-64-1", "fedora-x86-64-2",
 				      "fedora-x86-64-3", "fedora-x86-64-4" ] },
 
-		   { "name" : "Fedora-x86_64-cxx-build-m64",
-		     "type" : "PlainBuildWithCxx_c64notest",
-		     "builddir" : "fedora-x86-64-cxx-build",
-		     "PATH" : "/usr/local/bin:/usr/bin:/bin",
-		     "tags" : [ "fedora", "x86_64", "cxx-build-m64", "MAIL" ],
-		     "slavenames" : [ "fedora-x86-64-1", "fedora-x86-64-2",
-				      "fedora-x86-64-3", "fedora-x86-64-4" ] },
-
 		   { "name" : "Fedora-x86_64-c-build-m64",
 		     "type" : "PlainBuildWithC_c64notest",
 		     "builddir" : "fedora-x86-64-c-build",
@@ -295,7 +287,6 @@
 					  "Fedora-x86_64-native-extended-gdbserver-m32",
 					  "Fedora-x86_64-cc-with-index",
 					  "Fedora-i686",
-					  "Fedora-x86_64-cxx-build-m64",
 					  "Fedora-x86_64-c-build-m64",
 
 					  "Debian-x86_64-m64",
@@ -332,6 +323,12 @@
 
 		     },
 
+		     { "type" : "SingleBranchScheduler", "name" : "7_12_branch",
+		       "change_filter" : "all_gdb_filter_7_12_branch",
+		       "builderNames" : [ "Fedora-x86_64-c-build-m64" ]
+		     },
+
+
 		     { "type" : "Nightly", "name" : "racy",
 		       "dayOfWeek" : "6", "hour" : "3", "minute" : "00",
 		       "builderNames" : [ "Fedora-x86_64-m64",
diff --git a/master.cfg b/master.cfg
index 871bf4f..588c98e 100644
--- a/master.cfg
+++ b/master.cfg
@@ -1134,6 +1134,9 @@ class RunTestGDBPlainAIX (RunTestGDBAIX_Common, RunTestGDBPlain_c64t64):
 # All branches that are going to be watched.
 all_gdb_filter = ChangeFilter (branch_fn = should_watch_branch)
 
+# 7.12 branch.  temporary.
+all_gdb_filter_7_12_branch = ChangeFilter (branch = 'gdb-7.12-branch')
+
 # This function prevents a builder to build more than one build at the
 # same time.  This is needed because we do not have a way to lock the
 # git repository containing the test results of the builder, so