diff --git a/.cvsignore b/.cvsignore
index 378e6f9..4f19bcb 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-psutils-p17.tar.gz
+psutils-p17-clean.tar.gz
diff --git a/psutils-remove-copyrighted-files b/psutils-remove-copyrighted-files
index 622a883..577d13f 100644
--- a/psutils-remove-copyrighted-files
+++ b/psutils-remove-copyrighted-files
@@ -1,9 +1,9 @@
 #!/bin/bash
 archive_name=psutils-p17.tar.gz
-tar xzf $archive_name
+tar xzf psutils-p17.tar.gz
 rm psutils/fixmacps*
 rm psutils/md68_0.ps
 rm psutils/md71_0.ps
 patch -p0 < psutils-copyright.patch
-tar czf $archive_name psutils/
+tar czf psutils-p17-clean.tar.gz psutils/
 rm -r psutils/
diff --git a/psutils.spec b/psutils.spec
index 6ceda7f..8ae8be8 100644
--- a/psutils.spec
+++ b/psutils.spec
@@ -1,10 +1,13 @@
 Summary: PostScript Utilities
 Name: psutils
 Version: 1.17
-Release: 34%{dist}
+Release: 35%{dist}
 License: psutils
 Group: Applications/Publishing
-Source: ftp://ftp.knackered.org/pub/psutils/psutils-p17.tar.gz
+# We cannot use the upstream tarball because it contains non-free files.
+# To generate a clean tarball, run the psutils-remove-copyrighted-files script.
+#Source: ftp://ftp.knackered.org/pub/psutils/psutils-p17.tar.gz
+Source0: psutils-p17-clean.tar.gz
 Source1: psutils-remove-copyrighted-files
 URL: http://www.tardis.ed.ac.uk/~ajcd/psutils/
 Patch0: psutils-p17-Makefile.patch
@@ -105,6 +108,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Apr 22 2010 Daniel Novotny <dnovotny@redhat.com> 1.17-35
+- renamed "clean" tarball to psutils-p17-clean.tar.gz 
+  (merge review: #226324)
+
 * Tue Jan 26 2010 Daniel Novotny <dnovotny@redhat.com> 1.17-34
 - remove Apple copyrighted files (merge review: #226324)
 - fixed URLs to upstream
diff --git a/sources b/sources
index 959f9c6..ab863a7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e2817a52a66936055ab84f2061573c3b  psutils-p17.tar.gz
+e2817a52a66936055ab84f2061573c3b  psutils-p17-clean.tar.gz