diff --git a/a2ps.spec b/a2ps.spec
index f47f9c2..33f1f42 100644
--- a/a2ps.spec
+++ b/a2ps.spec
@@ -1,7 +1,7 @@
 Summary: Converts text and other types of files to PostScript
 Name: a2ps
 Version: 4.14
-Release: 27%{?dist}
+Release: 28%{?dist}
 License: GPLv3+
 Group: Applications/Publishing
 Source0: http://ftp.gnu.org/gnu/a2ps/%{name}-%{version}.tar.gz
@@ -56,23 +56,16 @@ Requires: tetex-dvips, tetex-latex, tetex-fonts, file, html2ps, psutils-perl
 # for hebrew support, path set. 
 # culmus-fonts
 # And certainly other font sets for other languages may be needed
+Requires: emacs-filesystem >= %{_emacs_version}
 Requires(post): coreutils
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 Obsoletes: a2ps-i18n <= 0.1-1
 Provides: a2ps-i18n = 0.1-2
-
-
-%package -n emacs-%{name}
-Summary: Emacs bindings for a2ps files
-Group: Applications/Editors
-Requires: emacs(bin) >= %{_emacs_version}
-
-
-%package -n emacs-%{name}-el
-Summary: Elisp source files for emacs-%{name} under GNU Emacs
-Group: Applications/Editors
-Requires:       emacs-%{name} = %{version}-%{release}
+Obsoletes: emacs-a2ps <= 4.14-27
+Provides: emacs-a2ps <= 4.14-27
+Obsoletes: emacs-a2ps-el <= 4.14-27
+Provides: emacs-a2ps-el <= 4.14-27
 
 
 %description
@@ -82,17 +75,6 @@ number of programming languages, encodings (ISO Latins, Cyrillic, etc.),
 and medias.
 
 
-%description -n emacs-%{name}
-Postscript printing hook for a2ps and major mode for a2ps style sheets
-for emacs.
-
-
-%description -n emacs-%{name}-el
-This package contains the elisp source files for emacs-%{name} under GNU 
-Emacs. You do not need to install this package to run emacs-%{name}. Install 
-the emacs-%{name} package to use emacs-%{name} with GNU Emacs.
-
-
 %prep
 %setup -q -a 1
 
@@ -306,17 +288,12 @@ exit 0
 %dir %{_datadir}/a2ps/afm
 %dir %{_datadir}/a2ps
 %{_libdir}/*.so*
-
-%files -n emacs-%{name}
-%defattr(-,root,root,-)
-%dir %{_emacs_sitelispdir}/%{name}
-%{_emacs_sitelispdir}/%{name}/*.elc
-
-%files -n emacs-%{name}-el
-%defattr(-,root,root,-)
-%{_emacs_sitelispdir}/%{name}/*.el
+%{_emacs_sitelispdir}/%{name}
 
 %changelog
+* Tue Jun 23 2015 Tim Waugh <twaugh@redhat.com> - 4.14-28
+- Moved emacs sub-packages into main package (bug #1234582).
+
 * Tue Jun 16 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.14-27
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild