diff --git a/a2ps-shell.patch b/a2ps-shell.patch
new file mode 100644
index 0000000..b26f648
--- /dev/null
+++ b/a2ps-shell.patch
@@ -0,0 +1,15 @@
+--- a2ps-4.13/src/select.c.shell	2004-07-29 16:43:08.178940204 +0100
++++ a2ps-4.13/src/select.c	2004-07-29 16:43:09.328722698 +0100
+@@ -148,8 +148,10 @@
+   command = ALLOCA (char, (2
+ 			   + strlen (job->file_command)
+ 			   + ustrlen (filename)));
+-  sprintf (command, "%s %s", job->file_command, (const char *) filename);
+-  message (msg_tool, (stderr, "Reading pipe: `%s'\n", command));
++  setenv ("filename", (const char *) filename, 1);
++  sprintf (command, "%s \"${filename}\"", job->file_command);
++  message (msg_tool, (stderr, "Reading pipe: `%s' [filename=%s]\n", command,
++	   (const char *) filename));
+   file_out = popen (command, "r");
+ 
+   /* Check for failure */
diff --git a/a2ps.spec b/a2ps.spec
index 7d96492..e21d615 100644
--- a/a2ps.spec
+++ b/a2ps.spec
@@ -1,5 +1,5 @@
 %define	ver	4.13b
-%define rel 39
+%define rel 40
 
 Summary: Converts text and other types of files to PostScript(TM).
 Name: a2ps
@@ -28,6 +28,7 @@ Patch18: a2ps-4.13-gnusource.patch
 Patch19: a2ps-4.13-bison.patch
 Patch20: a2ps-4.13-hebrew.patch
 Patch21: a2ps-4.13-malloc.patch
+Patch22: a2ps-shell.patch
 Requires: fileutils sh-utils info
 BuildRequires: /usr/bin/emacs, gperf, flex, libtool
 Url: http://www.inf.enst.fr/~demaille/a2ps/
@@ -83,6 +84,9 @@ and medias.
 # Prevent "error: conflicting types for 'malloc'".
 %patch21 -p1 -b .malloc
 
+# Use environment variable to pass filenames to shell (bug #128647).
+%patch22 -p1 -b .shell
+
 # Fix reference to a2ps binary (bug #112930).
 perl -pi -e "s,/usr/local/bin,%{_bindir}," contrib/emacs/a2ps.el
 libtoolize --copy --force
@@ -190,6 +194,9 @@ fi
 %dir %{_datadir}/a2ps
 
 %changelog
+* Thu Jul 29 2004 Tim Waugh <twaugh@redhat.com> 4.13b-40
+- Use environment variable to pass filenames to shell (bug #128647).
+
 * Thu Jun 24 2004 Tim Waugh <twaugh@redhat.com> 4.13b-39
 - Build requires libtool (bug #125823).