diff --git a/lib/config.json b/lib/config.json
index 43f3687..a03f12f 100644
--- a/lib/config.json
+++ b/lib/config.json
@@ -120,6 +120,13 @@
 		     "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",
+		     "PATH" : "/usr/local/bin:/usr/bin:/bin",
+		     "tags" : [ "fedora", "x86_64", "c-build-m64", "MAIL" ],
+		     "slavenames" : [ "fedora-x86-64-1", "fedora-x86-64-2",
+				      "fedora-x86-64-3", "fedora-x86-64-4" ] },
 
 		   { "name" : "Debian-x86_64-m64",
 		     "type" : "Plain_c64t64",
diff --git a/master.cfg b/master.cfg
index 5d7775c..5a47fb5 100644
--- a/master.cfg
+++ b/master.cfg
@@ -891,6 +891,14 @@ anything for now."""
         self.run_testsuite = False
         BuildAndTestGDBFactory.__init__ (self, **kwargs)
 
+class RunTestGDBPlainBuildWithC_c64notest (BuildAndTestGDBFactory):
+    """Compiling for 64-bit with --enable-build-with-cxx=no.  We do not test
+anything for now."""
+    def __init__ (self, **kwargs):
+        self.extra_conf_flags = [ '--enable-build-with-cxx=no' ]
+        self.run_testsuite = False
+        BuildAndTestGDBFactory.__init__ (self, **kwargs)
+
 # Classes needed for BSD systems
 
 class RunTestGDBBSD_Common (BuildAndTestGDBFactory):