diff --git a/src/version.c b/src/version.c
index a9773dd..0e2c9ed 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    16,
+/**/
     15,
 /**/
     14,
diff --git a/src/window.c b/src/window.c
index a0f196b..b1430a6 100644
--- a/src/window.c
+++ b/src/window.c
@@ -149,12 +149,18 @@
     case Ctrl_V:
     case 'v':
 		CHECK_CMDWIN
-#ifdef FEAT_VISUAL
+# ifdef FEAT_VISUAL
 		reset_VIsual_and_resel();	/* stop Visual mode */
-#endif
-#ifdef FEAT_GUI
+# endif
+# ifdef FEAT_QUICKFIX
+		/* When splitting the quickfix window open a new buffer in it,
+		 * don't replicate the quickfix buffer. */
+		if (bt_quickfix(curbuf))
+		    goto newwindow;
+# endif
+# ifdef FEAT_GUI
 		need_mouse_correct = TRUE;
-#endif
+# endif
 		win_split((int)Prenum, WSP_VERT);
 		break;
 #endif
@@ -168,7 +174,8 @@
 #endif
 		STRCPY(cbuf, "split #");
 		if (Prenum)
-		    sprintf((char *)cbuf + 7, "%ld", Prenum);
+		    vim_snprintf((char *)cbuf + 7, sizeof(cbuf) - 7,
+							       "%ld", Prenum);
 		do_cmdline_cmd(cbuf);
 		break;
 
@@ -183,9 +190,14 @@
 newwindow:
 #endif
 		if (Prenum)
-		    sprintf((char *)cbuf, "%ld", Prenum); /* window height */
+		    /* window height */
+		    vim_snprintf((char *)cbuf, sizeof(cbuf) - 5, "%ld", Prenum);
 		else
 		    cbuf[0] = NUL;
+#if defined(FEAT_VERTSPLIT) && defined(FEAT_QUICKFIX)
+		if (nchar == 'v' || nchar == Ctrl_V)
+		    STRCAT(cbuf, "v");
+#endif
 		STRCAT(cbuf, "new");
 		do_cmdline_cmd(cbuf);
 		break;