diff --git a/runtime/defaults.vim b/runtime/defaults.vim
index f3c639b..9b46c8e 100644
--- a/runtime/defaults.vim
+++ b/runtime/defaults.vim
@@ -111,6 +111,17 @@
 
   augroup END
 
+  " Quite a few people accidentally type "q:" instead of ":q" and get confused
+  " by the command line window.  Give a hint about how to get out.
+  " If you don't like this you can put this in your vimrc:
+  " ":augroup vimHints | au! | augroup END"
+  augroup vimHints
+    autocmd! CmdwinEnter *
+	  \ echohl Todo | 
+	  \ echo 'You discovered the command-line window! You can close it with ":q".' |
+	  \ echohl None
+  augroup END
+
 endif
 
 " Switch syntax highlighting on when the terminal has colors or when using the
diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim
index 9eb718f..045320e 100644
--- a/src/testdir/test_autocmd.vim
+++ b/src/testdir/test_autocmd.vim
Binary files differ
diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim
index 87ae6fa..295e59d 100644
--- a/src/testdir/test_cmdline.vim
+++ b/src/testdir/test_cmdline.vim
@@ -1255,6 +1255,7 @@
   CheckScreendump
 
   let lines =<< trim [SCRIPT]
+    augroup vimHints | au! | augroup END
     call setline(1, range(30))
     2split
   [SCRIPT]
diff --git a/src/version.c b/src/version.c
index e0bc5c1..e5146bc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3608,
+/**/
     3607,
 /**/
     3606,