diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 2c9c878..bf340de 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -5042,6 +5042,7 @@
 		&& eap->cmdidx != CMD_lgrep
 		&& eap->cmdidx != CMD_grepadd
 		&& eap->cmdidx != CMD_lgrepadd
+		&& eap->cmdidx != CMD_hardcopy
 #ifndef UNIX
 		&& !(eap->argt & NOSPC)
 #endif
diff --git a/src/testdir/test_hardcopy.vim b/src/testdir/test_hardcopy.vim
index ea9790d..2a316d4 100644
--- a/src/testdir/test_hardcopy.vim
+++ b/src/testdir/test_hardcopy.vim
@@ -60,3 +60,12 @@
     set printoptions&
   endif
 endfunc
+
+func Test_fname_with_spaces()
+  split t\ e\ s\ t.txt
+  call setline(1, ['just', 'some', 'text'])
+  hardcopy > %.ps
+  call assert_true(filereadable('t e s t.txt.ps'))
+  call delete('t e s t.txt.ps')
+  bwipe!
+endfunc
diff --git a/src/version.c b/src/version.c
index d312148..c0711fb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    615,
+/**/
     614,
 /**/
     613,