diff --git a/Dockerfile b/Dockerfile
index 7e33945..b2dbb31 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,15 @@
+#
+# DO NOT EDIT THIS DOCKERFILE
+#
+# This file is auto-generated via scripts/build-dockerfile
+# by using environment substitution while concatenating the
+# contents of templates/*, and then adding the contents
+# of Dockerfile.solution
+#
+# Most solution specific changes should be isolated in
+# Dockerfile.solution. After making changes, you can
+# then re-run scripts/build-dockerfile
+#
 
 #
 # Template  begins here (from templates/templates/00-FROM.in)
diff --git a/scripts/build-dockerfile b/scripts/build-dockerfile
index b4aa10c..3d566d8 100755
--- a/scripts/build-dockerfile
+++ b/scripts/build-dockerfile
@@ -10,6 +10,21 @@ export $(grep -v '^#' MANIFEST | xargs -d '\n')
 #
 [ -e Dockerfile ] && rm Dockerfile
 
+cat << EOM > Dockerfile
+#
+# DO NOT EDIT THIS DOCKERFILE
+#
+# This file is auto-generated via scripts/build-dockerfile
+# by using environment substitution while concatenating the
+# contents of templates/*, and then adding the contents
+# of Dockerfile.solution
+#
+# Most solution specific changes should be isolated in
+# Dockerfile.solution. After making changes, you can
+# then re-run scripts/build-dockerfile
+#
+EOM
+
 for snippet in templates/*.in; do
   cat << EOM >> Dockerfile