diff --git a/CHANGES b/CHANGES
index 516943f29d..341609c748 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,10 @@
 
+2.6-482 | 2019-06-20 19:57:20 -0700
+
+  * Make configure complain if submodules are not checked out. (Johanna Amann, Corelight)
+
+  * Improve C++ header includes to improve build time (Jon Siwek, Corelight)
+
 2.6-479 | 2019-06-20 18:31:58 -0700
 
   * Fix TableVal::DoClone to use CloneState cache (Jon Siwek, Corelight)
diff --git a/VERSION b/VERSION
index 6802e60598..e7b0a1a59f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.6-479
+2.6-482
diff --git a/configure b/configure
index ec344d808f..4c45a1f70d 100755
--- a/configure
+++ b/configure
@@ -106,6 +106,18 @@ Usage: $0 [OPTION]... [VAR=VALUE]...
 
 sourcedir="$( cd "$( dirname "$0" )" && pwd )"
 
+if [ ! -e "$sourcedir/cmake/COPYING" ] && [ -d "$sourcedir/.git" ]; then
+    echo "\
+You seem to be missing the content of the cmake directory.
+
+This typically means that you performed a non-recursive git clone of
+Zeek. To check out the required subdirectories, please execute:
+
+  ( cd $sourcedir && git submodule update --recursive --init )
+" >&2;
+    exit 1;
+fi
+
 # Function to append a CMake cache entry definition to the
 # CMakeCacheEntries variable.
 #   $1 is the cache entry variable name