diff --git a/dtool/CompilerFlags.cmake b/dtool/CompilerFlags.cmake
index 118e8f95d6..9dc85df8e9 100644
--- a/dtool/CompilerFlags.cmake
+++ b/dtool/CompilerFlags.cmake
@@ -8,6 +8,14 @@
 
 include(CheckCXXCompilerFlag)
 
+# These are flags for the custom configurations we add
+# Standard
+set(CMAKE_C_FLAGS_STANDARD "-O3")
+set(CMAKE_CXX_FLAGS_STANDARD "-O3")
+set(CMAKE_SHARED_LINKER_FLAGS_STANDARD "")
+set(CMAKE_MODULE_LINKER_FLAGS_STANDARD "")
+set(CMAKE_EXE_LINKER_FLAGS_STANDARD "")
+
 # Panda3D is now a C++11 project. Newer versions of CMake support this out of
 # the box; for older versions we take a shot in the dark:
 if(CMAKE_VERSION VERSION_LESS "3.1")
@@ -101,6 +109,7 @@ if(NOT "x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC")
   set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wno-unused-variable")
   set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -Wno-unused-variable")
   set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -Wno-unused-variable")
+  set(CMAKE_CXX_FLAGS_STANDARD "${CMAKE_CXX_FLAGS_STANDARD} -Wno-unused-variable")
 
   if(MSVC)
     # Clang behaving as MSVC
@@ -187,11 +196,3 @@ if(NOT MSVC)
     add_compile_options("-fvisibility=hidden")
   endif()
 endif()
-
-# These are flags for the custom configurations we add
-# Distribution
-set(CMAKE_C_FLAGS_DISTRIBUTION "")
-set(CMAKE_CXX_FLAGS_DISTRIBUTION "")
-set(CMAKE_SHARED_LINKER_FLAGS_DISTRIBUTION "")
-set(CMAKE_MODULE_LINKER_FLAGS_DISTRIBUTION "")
-set(CMAKE_EXE_LINKER_FLAGS_DISTRIBUTION "")
diff --git a/dtool/Config.cmake b/dtool/Config.cmake
index 0248fbff20..98146a1b83 100644
--- a/dtool/Config.cmake
+++ b/dtool/Config.cmake
@@ -36,7 +36,7 @@ endif()
 
 # Define the type of build we are setting up.
 if(IS_MULTICONFIG)
-  set(CMAKE_CONFIGURATION_TYPES Release RelWithDebInfo Debug MinSizeRel Distribution)
+  set(CMAKE_CONFIGURATION_TYPES Release RelWithDebInfo Debug MinSizeRel Standard)
 else()
   # CMAKE_BUILD_TYPE can't just be set using the usual set(CACHE) method since
   # it's an empty string by default.
@@ -44,7 +44,7 @@ else()
     set(CMAKE_BUILD_TYPE RelWithDebInfo)
   endif()
   set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
-    Release RelWithDebInfo Debug MinSizeRel Distribution)
+    Release RelWithDebInfo Debug MinSizeRel Standard)
 endif()
 
 # Provide convenient boolean expression based on build type
@@ -64,14 +64,6 @@ else()
   set(IS_NOT_MINSIZE_BUILD True)
 endif()
 
-if(CMAKE_BUILD_TYPE MATCHES "Distribution")
-  set(IS_DIST_BUILD True)
-  set(IS_NOT_DIST_BUILD False)
-else()
-  set(IS_DIST_BUILD False)
-  set(IS_NOT_DIST_BUILD True)
-endif()
-
 set(PER_CONFIG_OPTIONS)
 
 # Are we building with static or dynamic linking?