diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx
index fcaa16963..cfd5e76df 100644
--- a/Source/cmDocumentVariables.cxx
+++ b/Source/cmDocumentVariables.cxx
@@ -1621,6 +1621,12 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
      false,
      "Variables for Languages");
 
+  cm->DefineProperty
+     ("CMAKE_<LANG>_FLAGS", cmProperty::VARIABLE,
+      "Flags for all build types.",
+      "<LANG> flags used regardless of the value of CMAKE_BUILD_TYPE.",false,
+      "Variables for Languages");
+
   cm->DefineProperty
     ("CMAKE_<LANG>_FLAGS_DEBUG", cmProperty::VARIABLE,
      "Flags for Debug build type or configuration.",
@@ -1862,8 +1868,6 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
                      cmProperty::VARIABLE,0,0);
   cm->DefineProperty("CMAKE_<LANG>_CREATE_PREPROCESSED_SOURCE",
                      cmProperty::VARIABLE,0,0);
-  cm->DefineProperty("CMAKE_<LANG>_FLAGS",
-                     cmProperty::VARIABLE,0,0);
   cm->DefineProperty("CMAKE_<LANG>_FLAGS_DEBUG_INIT",
                      cmProperty::VARIABLE,0,0);
   cm->DefineProperty("CMAKE_<LANG>_FLAGS_INIT",