diff --git a/cdargs.spec b/cdargs.spec
index 7af9451..b7cd24b 100644
--- a/cdargs.spec
+++ b/cdargs.spec
@@ -2,7 +2,7 @@
 
 Name:       cdargs
 Version:    1.35
-Release:    21%{?dist}
+Release:    22%{?dist}
 Summary:    The shell cd with bookmarks and browser
 License:    GPLv2+
 URL:        http://www.skamphausen.de/cgi-bin/ska/CDargs/
@@ -13,9 +13,10 @@ Patch0:     %{name}-%{version}_shebangs.patch
 Patch1:     %{name}-%{version}_format_security.patch
 Patch2:     %{name}-%{version}_fix_fsf_address.patch
 
-BuildRequires:  gcc-c++
+BuildRequires:    gcc-c++
 BuildRequires:    ncurses-devel
 BuildRequires:    emacs
+Requires:         emacs-filesystem >= %{_emacs_version}
 
 %description
 Enables the user to quickly change working directory by navigating cd arguments
@@ -24,30 +25,12 @@ and expanding the shell built-in cd with bookmarks and browser.
 
 %package devel
 Summary:    Development files for %{name}
-
-Requires:    %{name}%{?_isa} = %{version}-%{release}
+Requires:   %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
 This package contains development files for %{name}.
 
 
-%package -n emacs-cdargs
-Summary:    Cdargs support for Emacs
-BuildArch:    noarch
-
-Requires:    %{name} = %{version}-%{release}
-Requires:    emacs(bin) >= %{_emacs_version}
-
-Provides:    emacs-%{name}-el = %{version}-%{release}
-Obsoletes:   emacs-%{name}-el < 1.35-20
-
-%description -n emacs-cdargs
-This is an Emacs front-end to cdargs. It provides a function (cv or
-cdargs) which uses the same bookmarks list as the terminal program
-cdargs and lets the user quickly make a directory listed there the
-current working directory.
-
-
 %prep
 %autosetup -p1
 
@@ -79,21 +62,20 @@ install -D -p -m 644 src/cdargs.h %{buildroot}%{_includedir}/cdargs.h
 %{_bindir}/cdargs
 %config(noreplace) %{profiledir}/cdargs.*
 %doc %{_mandir}/man1/cdargs.1*
+%dir %{_emacs_sitelispdir}/%{name}
+%{_emacs_sitelispdir}/%{name}/*.el
+%{_emacs_sitelispdir}/%{name}/*.elc
+%{_emacs_sitestartdir}/cdargs-init.el
 
 
 %files devel
 %{_includedir}/cdargs.h
 
 
-%files -n emacs-cdargs
-%dir %{_emacs_sitelispdir}/%{name}
-%license COPYING
-%{_emacs_sitelispdir}/%{name}/*.el
-%{_emacs_sitelispdir}/%{name}/*.elc
-%{_emacs_sitestartdir}/cdargs-init.el
-
-
 %changelog
+* Fri Mar 22 20:25:44 CET 2019 Robert-André Mauchin <zebob.m@gmail.com> - 1.35-22
+- Remove emacs subpackage to conform with Emacs packaging guidelines (#1234562)
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.35-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
@@ -142,7 +124,7 @@ install -D -p -m 644 src/cdargs.h %{buildroot}%{_includedir}/cdargs.h
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
 * Sun Mar 14 2010 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 1.35-6
-- Update spec file to bring it into compliance with Emacs add-on packaging 
+- Update spec file to bring it into compliance with Emacs add-on packaging
   guidelines
 - Split Elisp source files into separate subpackage
 
@@ -154,7 +136,7 @@ install -D -p -m 644 src/cdargs.h %{buildroot}%{_includedir}/cdargs.h
 
 
 * Sun Jan 11 2009 Milos Jakubicek <xjakub@fi.muni.cz> - 1.35-3
-- Fixed usage in other shells than bash: minor compatibility code changes and 
+- Fixed usage in other shells than bash: minor compatibility code changes and
   no complains because completion doesn't work (fix BZ#479398).
 
 * Tue Mar 25 2008 Milos Jakubicek <xjakub@fi.muni.cz> - 1.35-2