diff --git a/lib/config.json b/lib/config.json
index b88584d..6c97121 100644
--- a/lib/config.json
+++ b/lib/config.json
@@ -253,6 +253,12 @@
 		     "builddir" : "rhel-s390x",
 		     "tags" : [ "rhel", "s390x", "m64", "MAIL" ],
 		     "slavenames" : [ "rhel-7.1-s390x-1" ] },
+
+		   { "name" : "NetBSD-x86_64-m64",
+		     "type" : "PlainBSD_c64t64",
+		     "builddir" : "netbsd-x86_64",
+		     "tags" : [ "netbsd", "x86_64", "m64", "TEST" ],
+		     "slavenames" : [ "gdb-amd64-netbsd7" ] }
 		 ],
 
     "schedulers" : [ { "type" : "AnyBranchScheduler", "name" : "master",
@@ -291,7 +297,9 @@
 
 					  "AIX-POWER7-plain",
 
-					  "RHEL-s390x-m64" ]
+					  "RHEL-s390x-m64",
+
+					  "NetBSD-x86_64-m64" ]
 
 		     }
 		   ]
diff --git a/master.cfg b/master.cfg
index 3403d96..47ce8be 100644
--- a/master.cfg
+++ b/master.cfg
@@ -792,7 +792,7 @@ anything for now."""
 class RunTestGDBBSD_Common (BuildAndTestGDBFactory):
     """Common BSD test configurations"""
     def __init__ (self, **kwargs):
-        self.extra_conf_flags = [ 'CFLAGS=-I/usr/local/include', '--disable-werror' ]
+#        self.extra_conf_flags = [ 'CFLAGS=-I/usr/local/include', '--disable-werror' ]
         self.make_command = 'gmake'
         BuildAndTestGDBFactory.__init__ (self, **kwargs)