diff --git a/master.cfg b/master.cfg
index 42d60b3..feb56f6 100644
--- a/master.cfg
+++ b/master.cfg
@@ -975,13 +975,6 @@ The parameters of the class are:
 
     - system_debuginfo_location: Set this to the location of the
       debuginfo files in the system.  Default: "/usr/lib/debug"
-
-    - default_CFLAGS: The default CFLAGS options that are always
-      passed to configure.  These are joined with extra_CFLAGS.
-
-    - default_CXXFLAGS: The default CXXFLAGS options that are always
-      passed to configure.  These are joined with extra_CXXFLAGS.
-
     """
     ConfigureClass = ConfigureGDB
     CompileClass = CompileGDB
@@ -1013,13 +1006,13 @@ The parameters of the class are:
     use_system_debuginfo = True
     system_debuginfo_location = "/usr/lib/debug"
 
-    # Default CFLAGS/CXXFLAGS that are always passed to "configure".
-    default_CFLAGS = "-D_GLIBCXX_DEBUG"
-    default_CXXFLAGS= "-D_GLIBCXX_DEBUG"
-
     def __init__ (self, architecture_triplet = [], initial_delay = None):
         factory.BuildFactory.__init__ (self)
 
+        # Default CFLAGS/CXXFLAGS that are always passed to "configure".
+        default_CFLAGS = "-D_GLIBCXX_DEBUG"
+        default_CXXFLAGS = "-D_GLIBCXX_DEBUG"
+
         self.architecture_triplet = architecture_triplet
 
         # mjw asked me to delay the build by X number of seconds.