diff --git a/CHANGES b/CHANGES
index a8086af261..a8a965618d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,12 @@
 
+2.4-45 | 2015-07-21 10:50:02 -0700
+
+  * Requiring a C++11 compiler, and turning on C++11 support. (Robin
+    Sommer)
+
+  * Tweaking the listing of hooks in "bro -NN" for consistency. (Robin
+    Sommer)
+
 2.4-41 | 2015-07-21 08:35:17 -0700
 
   * Fixing compiler warning. (Robin Sommer)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2b1e060f77..30e1a4a545 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -165,6 +165,7 @@ include(PCAPTests)
 include(OpenSSLTests)
 include(CheckNameserCompat)
 include(GetArchitecture)
+include(RequireCXX11)
 
 # Tell the plugin code that we're building as part of the main tree.
 set(BRO_PLUGIN_INTERNAL_BUILD true CACHE INTERNAL "" FORCE)
@@ -177,10 +178,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 ########################################################################
 ## Recurse on sub-directories
 
-if ( ENABLE_CXX11 )
-    include(RequireCXX11)
-endif ()
-
 if ( ENABLE_BROKER )
     add_subdirectory(aux/broker)
     set(brodeps ${brodeps} broker)
diff --git a/VERSION b/VERSION
index ab3d92f8ce..a0a6bdf623 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.4-41
+2.4-45
diff --git a/configure b/configure
index b139ee2bec..950905b2c1 100755
--- a/configure
+++ b/configure
@@ -41,7 +41,6 @@ Usage: $0 [OPTION]... [VAR=VALUE]...
     --enable-perftools-debug use Google's perftools for debugging
     --enable-jemalloc      link against jemalloc
     --enable-ruby          build ruby bindings for broccoli (deprecated)
-    --enable-c++11         build using the C++11 standard
     --enable-broker        enable use of the Broker communication library
                            (requires C++ Actor Framework and C++11)
     --disable-broccoli     don't build or install the Broccoli library
@@ -187,11 +186,7 @@ while [ $# -ne 0 ]; do
         --enable-jemalloc)
             append_cache_entry ENABLE_JEMALLOC     BOOL   true
             ;;
-        --enable-c++11)
-            append_cache_entry ENABLE_CXX11         BOOL   true
-            ;;
         --enable-broker)
-            append_cache_entry ENABLE_CXX11         BOOL   true
             append_cache_entry ENABLE_BROKER        BOOL   true
             append_cache_entry BROKER_PYTHON_HOME   PATH   $prefix
             user_enabled_broker="true"