diff --git a/gettext-0.17-autopoint-CVS-441481.patch b/gettext-0.17-autopoint-CVS-441481.patch
new file mode 100644
index 0000000..47e1ca6
--- /dev/null
+++ b/gettext-0.17-autopoint-CVS-441481.patch
@@ -0,0 +1,24 @@
+2008-04-20  Bruno Haible  <bruno@clisp.org>
+
+	* autopoint.in: Check that really all CVS directories are removed.
+	Reported by Jim Meyering <jim@meyering.net>.
+
+*** gettext-tools/misc/autopoint.in        18 Jan 2008 23:30:16 -0000      1.37
+--- gettext-tools/misc/autopoint.in        20 Apr 2008 06:06:07 -0000
+***************
+*** 426,431 ****
+--- 426,438 ----
+  cvsver=gettext-`echo "$ver" | sed -e 's/\./_/g'`
+  (cvs checkout -r"$cvsver" archive > /dev/null) 2>&1 | grep -v '^cvs checkout: Updating'
+  find archive -name CVS -type d -print | xargs rm -rf
++ # Check that really all CVS directories are gone, otherwise we would overwrite
++ # the contents of the user's CVS directories.
++ if test `find archive -name CVS -type d -print | wc -l` != 0; then
++   cd ..
++   rm -rf "$cvs_dir" "$work_dir"
++   func_fatal_error "failed to remove all CVS subdirectories"
++ fi
+  if test `find archive -type f -print | wc -l` = 0; then
+    cd ..
+    rm -rf "$cvs_dir" "$work_dir"
+
diff --git a/gettext.spec b/gettext.spec
index 7352502..2fd50e1 100644
--- a/gettext.spec
+++ b/gettext.spec
@@ -4,7 +4,7 @@
 Summary: GNU libraries and utilities for producing multi-lingual messages
 Name: gettext
 Version: 0.17
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv3 and LGPLv2+
 Group: Development/Tools
 URL: http://www.gnu.org/software/gettext/
@@ -26,6 +26,7 @@ BuildRequires: zip, unzip
 %endif
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Patch5: gettext-0.17-open-args.patch
+Patch6: gettext-0.17-autopoint-CVS-441481.patch
 
 %description
 The GNU gettext package provides a set of tools and documentation for
@@ -69,6 +70,7 @@ This package contains libraries used internationalization support.
 %prep
 %setup -q
 %patch5 -p0 -b .5-open-args~
+%patch6 -p0 -b .5-open-args~
 
 
 %build
@@ -232,6 +234,9 @@ fi
 
 
 %changelog
+* Thu Apr 24 2008 Jens Petersen <petersen@redhat.com> - 0.17-5
+- fix autopoint messing up CVS files with upstream patch (#441481)
+
 * Mon Feb 18 2008 Jens Petersen <petersen@redhat.com> - 0.17-4
 - if %%buildjar is off make sure libintl.jar does not get installed (#433210)