diff --git a/src/Makefile b/src/Makefile
index 24aa9ca..f08b58c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2022,6 +2022,7 @@
 	test_cdo \
 	test_channel \
 	test_cmdline \
+	test_cscope \
 	test_cursor_func \
 	test_delete \
 	test_ex_undo \
diff --git a/src/option.h b/src/option.h
index 6fba8b8..8f75993 100644
--- a/src/option.h
+++ b/src/option.h
@@ -429,7 +429,7 @@
 EXTERN int	p_csre;		/* 'cscoperelative' */
 # ifdef FEAT_QUICKFIX
 EXTERN char_u	*p_csqf;	/* 'cscopequickfix' */
-#  define	CSQF_CMDS   "sgdctefi"
+#  define	CSQF_CMDS   "sgdctefia"
 #  define	CSQF_FLAGS  "+-0"
 # endif
 EXTERN int	p_cst;		/* 'cscopetag' */
diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak
index dabf573..8393de8 100644
--- a/src/testdir/Make_all.mak
+++ b/src/testdir/Make_all.mak
@@ -169,6 +169,7 @@
 	    test_cdo.res \
 	    test_channel.res \
 	    test_cmdline.res \
+	    test_cscope.res \
 	    test_farsi.res \
 	    test_hardcopy.res \
 	    test_history.res \
diff --git a/src/testdir/test_cscope.vim b/src/testdir/test_cscope.vim
new file mode 100644
index 0000000..b6d70f0
--- /dev/null
+++ b/src/testdir/test_cscope.vim
@@ -0,0 +1,15 @@
+" Test for cscope commands.
+
+if !has('cscope')
+  finish
+endif
+
+func Test_cscopequickfix()
+  set cscopequickfix=s-,g-,d+,c-,t+,e-,f0,i-,a-
+  call assert_equal('s-,g-,d+,c-,t+,e-,f0,i-,a-', &cscopequickfix)
+
+  call assert_fails('set cscopequickfix=x-', 'E474:')
+  call assert_fails('set cscopequickfix=s', 'E474:')
+  call assert_fails('set cscopequickfix=s7', 'E474:')
+  call assert_fails('set cscopequickfix=s-a', 'E474:')
+endfunc
diff --git a/src/version.c b/src/version.c
index 895937e..6dbbeb9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -759,6 +759,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2033,
+/**/
     2032,
 /**/
     2031,