diff --git a/gettext.spec b/gettext.spec
index e05ec01..5848a04 100644
--- a/gettext.spec
+++ b/gettext.spec
@@ -6,7 +6,7 @@
 Summary: GNU libraries and utilities for producing multi-lingual messages
 Name: gettext
 Version: 0.18.1.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv3+ and LGPLv2+
 Group: Development/Tools
 URL: http://www.gnu.org/software/gettext/
@@ -53,25 +53,20 @@ catalogs and is a powerful and simple method for internationalizing
 programs.
 
 
-%package autopoint
-Summary: gettext autopoint tool
-Group: Development/Tools
-License: GPLv3+
-BuildArch: noarch
-Requires: git
-
-%description autopoint
-Autopoint is a utility to setup standard gettext files in a source tree.
-
-
 %package devel
 Summary: Development files for %{name}
 Group: Development/Tools
-License: LGPLv2+
+# autopoint is GPLv3+
+License: LGPLv2+ and GPLv3+
 Requires: %{name} = %{version}-%{release}
 Requires: %{name}-libs = %{version}-%{release}
 Requires(post): info
 Requires(preun): info
+# for autopoint
+Requires: git
+Obsoletes: gettext-autopoint < 0.18.1.1-3
+Provides: gettext-autopoint = %{version}-%{release}
+
 
 %description devel
 This package contains all development related files necessary for
@@ -251,7 +246,7 @@ fi
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc gettext-runtime/ABOUT-NLS AUTHORS gettext-runtime/BUGS
+%doc AUTHORS gettext-runtime/BUGS
 %doc COPYING gettext-tools/misc/DISCLAIM README
 %doc NEWS THANKS 
 %doc gettext-runtime/man/*.1.html
@@ -267,19 +262,16 @@ fi
 %exclude %{_libdir}/%{name}/gnu.gettext.*
 %endif
 %dir %{_datadir}/%{name}
+%{_datadir}/%{name}/ABOUT-NLS
 %{_datadir}/%{name}/intl
 %{_datadir}/%{name}/po
 %{_datadir}/%{name}/styles
 
-%files autopoint
-%{_bindir}/autopoint
-%{_datadir}/%{name}/archive.*.tar.gz
-%{_mandir}/man1/autopoint.1*
-
 %files devel
 %defattr(-,root,root,-)
 %doc gettext-runtime/man/*.3.html ChangeLog
-%{_datadir}/%{name}/ABOUT-NLS
+%{_bindir}/autopoint
+%{_datadir}/%{name}/archive.*.tar.gz
 %{_datadir}/%{name}/projects/
 %{_datadir}/%{name}/config.rpath
 %{_datadir}/%{name}/*.h
@@ -292,6 +284,7 @@ fi
 %{_libdir}/libgettextlib.so
 %{_libdir}/libgettextsrc.so
 %{_libdir}/preloadable_libintl.so
+%{_mandir}/man1/autopoint.1*
 %{_mandir}/man3/*
 %{_datadir}/%{name}/javaversion.class
 %doc gettext-runtime/intl-java/javadoc*
@@ -320,6 +313,10 @@ fi
 %{_emacs_sitelispdir}/%{name}/*.el
 
 %changelog
+* Mon Aug 23 2010 Jens Petersen <petersen@redhat.com> - 0.18.1.1-3
+- merge autopoint subpackage into devel to simplify deps (#625325)
+- have ABOUT-NLS only in base package datadir
+
 * Wed Jun 23 2010 Jens Petersen <petersen@redhat.com> - 0.18.1.1-2
 - correct license tag from GPLv3 to GPLv3+
 - subpackage autopoint which requires git (#574031)