diff --git a/gambit-c.spec b/gambit-c.spec
index f79ebc8..66de894 100644
--- a/gambit-c.spec
+++ b/gambit-c.spec
@@ -17,7 +17,7 @@
 
 Name:           gambit-c
 Version:        4.7.9
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Scheme programming system
 
 Group:          Development/Languages
@@ -29,9 +29,6 @@ Patch0:         gambc-v4_2_8-modtime.patch
 
 BuildRequires:  emacs
 Requires:       gcc
-Requires:       emacs-filesystem >= %{_emacs_version}
-Obsoletes:      emacs-gambit    < 4.7.7-2
-Obsoletes:      emacs-gambit-el < 4.7.7-2
 
 %description
 Gambit-C includes a Scheme interpreter and a Scheme compiler which can
@@ -65,6 +62,27 @@ with a decent C compiler.
 This package contains the Gambit-C user manual in HTML and PDF formats.
 
 
+%package -n emacs-gambit
+Summary:        Gambit-C editing mode for Emacs
+Group:          Applications/Editors
+
+BuildArch:      noarch
+Requires:       emacs(bin) >= %{_emacs_version}
+
+%description -n emacs-gambit
+An Emacs mode for editing Gambit-C Scheme source code.
+
+%package -n emacs-gambit-el
+Summary:        Elisp source file for emacs-gambit
+Group:          Applications/Editors
+
+BuildArch:      noarch
+Requires:       emacs-gambit = %{version}-%{release}
+
+%description -n emacs-gambit-el
+Elisp source file for the Gambit-C editing mode for Emacs.
+
+
 %prep
 %setup -q -n %{_dirname}
 %patch0 -p1 -b .modtime
@@ -161,10 +179,16 @@ fi
 %{_mandir}/man1/gsi.*
 %{_libdir}/%{name}
 %{_libdir}/*.a
-%{_emacs_sitelispdir}/*.el
+
+%files -n emacs-gambit
+%defattr(-,root,root,-)
+%doc LGPL.txt LICENSE-2.0.txt
 %{_emacs_sitelispdir}/*.elc
 %{_emacs_sitestartdir}/gambit-init.el
 
+%files -n emacs-gambit-el
+%defattr(-,root,root,-)
+%{_emacs_sitelispdir}/*.el
 
 %files doc
 %defattr(-,root,root,-)
@@ -176,6 +200,9 @@ fi
 
 
 %changelog
+* Fri Sep 11 2015 Michel Alexandre Salim <salimma@fedoraproject.org> - 4.7.9-1.1
+- Restore old Emacs subpackages; new guidelines do not apply to el6
+
 * Sun Sep  6 2015 Michel Alexandre Salim <salimma@fedoraproject.org> - 4.7.9-1
 - Update to 4.7.9
 - Update home page link