diff --git a/gettext.spec b/gettext.spec
index ec640cd..0eeb318 100644
--- a/gettext.spec
+++ b/gettext.spec
@@ -5,7 +5,7 @@
 Summary: GNU libraries and utilities for producing multi-lingual messages
 Name: gettext
 Version: 0.17
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: GPLv3 and LGPLv2+
 Group: Development/Tools
 URL: http://www.gnu.org/software/gettext/
@@ -28,6 +28,8 @@ BuildRequires: zip, unzip
 %endif
 # need expat for xgettext on glade
 Buildrequires: expat-devel
+# for po-mode.el
+BuildRequires: emacs
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 # for autopoint:
 Requires: cvs
@@ -77,6 +79,25 @@ License: LGPLv2+
 %description libs
 This package contains libraries used internationalization support.
 
+%package -n emacs-%{name}
+Summary: Support for editing po files within GNU Emacs
+Group: Applications/Editors
+BuildArch: noarch
+Requires: emacs(bin) >= %{_emacs_version}
+
+%description -n emacs-%{name}
+This package provides a major mode for editing po files within GNU Emacs.
+
+%package -n emacs-%{name}-el
+Summary: Elisp source files for editing po files within GNU Emacs
+Group: Applications/Editors
+BuildArch: noarch
+Requires: emacs-%{name} = %{version}-%{release}
+
+%description -n emacs-%{name}-el
+This package contains the Elisp source files for editing po files within GNU
+Emacs.
+
 
 %prep
 %setup -q
@@ -115,7 +136,7 @@ make %{?_smp_mflags} %{?with_java:GCJFLAGS="-findirect-dispatch"}
 %install
 rm -rf %{buildroot}
 make install DESTDIR=${RPM_BUILD_ROOT} INSTALL="%{__install} -p" \
-    lispdir=%{_datadir}/emacs/site-lisp \
+    lispdir=%{_datadir}/emacs/site-lisp/gettext \
     aclocaldir=%{_datadir}/aclocal EXAMPLESFILES=""
 
 # move gettext to /bin
@@ -161,9 +182,13 @@ rm -f ${RPM_BUILD_ROOT}%{_datadir}/%{name}/libintl.jar
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/%{name}/gettext.jar
 
 # remove unpackaged files from the buildroot
-rm -rf ${RPM_BUILD_ROOT}%{_datadir}/emacs
 rm ${RPM_BUILD_ROOT}%{_libdir}/lib*.la
 
+# move po-mode initialization elisp file to the right place, and remove byte
+# compiled file
+install -d ${RPM_BUILD_ROOT}%{_emacs_sitestartdir}
+mv ${RPM_BUILD_ROOT}%{_emacs_sitelispdir}/%{name}/start-po.el ${RPM_BUILD_ROOT}%{_emacs_sitestartdir}
+rm ${RPM_BUILD_ROOT}%{_emacs_sitelispdir}/%{name}/start-po.elc
 
 %find_lang %{name}-runtime
 %find_lang %{name}-tools
@@ -225,8 +250,6 @@ fi
 %doc gettext-runtime/intl/COPYING*
 /bin/*
 %{_bindir}/*
-%{_libdir}/libgettextlib-%{version}.so
-%{_libdir}/libgettextsrc-%{version}.so
 %{_infodir}/gettext*
 %{_mandir}/man1/*
 %{_libdir}/%{name}
@@ -268,12 +291,28 @@ fi
 
 %files libs
 %defattr(-,root,root,-)
-
 %{_libdir}/libasprintf.so.*
+%{_libdir}/libgettextlib-%{version}.so
 %{_libdir}/libgettextpo.so.*
+%{_libdir}/libgettextsrc-%{version}.so
 
+%files -n emacs-%{name}
+%defattr(-,root,root,-)
+%dir %{_emacs_sitelispdir}/%{name}
+%{_emacs_sitelispdir}/%{name}/*.elc
+%{_emacs_sitestartdir}/*.el
+
+%files -n emacs-%{name}-el
+%defattr(-,root,root,-)
+%{_emacs_sitelispdir}/%{name}/*.el
 
 %changelog
+* Fri Apr 23 2010 Jens Petersen <petersen@redhat.com> - 0.17-17
+- create emacs subpackages for po-mode.el (thanks for patch from
+  Jonathan Underwood, #579452)
+- move libgettextlib and libgettextsrc from base to libs subpackage
+  (requested by Peter Robinson for blender, #579388)
+
 * Fri Nov 27 2009 Jens Petersen <petersen@redhat.com> - 0.17-16
 - fix FTBFS by removing openmp.m4 which conflicts with recent autoconf (#539211)
 - cleanup gettext-0.17-rpathFix.patch