diff --git a/bigloo.spec b/bigloo.spec
index 82562f1..b3efe5b 100644
--- a/bigloo.spec
+++ b/bigloo.spec
@@ -19,7 +19,7 @@
 
 Name:           bigloo
 Version:        4.1a
-Release:        7%{?patch_ver:.%{patch_ver}}%{?prerel:.%{prerel}}%{?dist}
+Release:        8%{?patch_ver:.%{patch_ver}}%{?prerel:.%{prerel}}%{?dist}
 Summary:        A compiler for the Scheme programming language
 
 Group:          Development/Languages
@@ -57,6 +57,8 @@ BuildRequires:  texinfo-tex
 BuildRequires:  texi2html
 
 Requires:       bigloo-libs%{?_isa} = %{version}-%{release}
+Requires:       emacs-filesystem >= %{_emacs_version}
+Requires:       xemacs-filesystem >= %{_xemacs_version}
 Requires:       indent
 Requires:       gmp-devel%{?_isa}
 Requires:       gc-devel%{?_isa}
@@ -69,6 +71,17 @@ Requires(postun):  info
 
 ExcludeArch:    ppc64
 
+# This can be removed when Fedora 22 reaches EOL
+Obsoletes:      emacs-%{pkg} < 4.1a-8.2%{?dist}
+Provides:       emacs-%{pkg} = %{version}-%{release}
+Obsoletes:      emacs-%{pkg}-el < 4.1a-8.2%{?dist}
+Provides:       emacs-%{pkg}-el = %{version}-%{release}
+Obsoletes:      xemacs-%{pkg} < 4.1a-8.2%{?dist}
+Provides:       xemacs-%{pkg} = %{version}-%{release}
+Obsoletes:      xemacs-%{pkg}-el < 4.1a-8.2%{?dist}
+Provides:       xemacs-%{pkg}-el = %{version}-%{release}
+
+
 %description
 Bigloo is a Scheme implementation devoted to one goal: enabling a Scheme
 based programming style where C(++) is usually required.  Bigloo
@@ -97,51 +110,6 @@ Documentation for the Bigloo compiler and integrated development
 environment.
 
 
-%package -n emacs-%{pkg}
-Summary:        Compiled elisp files to run %{pkgname} under GNU Emacs
-Group:          Development/Languages
-BuildArch:      noarch
-Requires:       emacs(bin) >= %{_emacs_version}
-
-%description -n emacs-%{pkg}
-This package contains the byte compiled elisp files to run %{pkgname}
-with GNU Emacs.
-
-%package -n emacs-%{pkg}-el
-Summary:        Elisp source files for %{pkgname} under GNU Emacs
-Group:          Development/Languages
-BuildArch:      noarch
-Requires:       emacs-%{pkg} = %{version}-%{release}
-
-%description -n emacs-%{pkg}-el
-This package contains the elisp source files for %{pkgname} under GNU Emacs. You
-do not need to install this package to run %{pkgname}. Install the emacs-%{pkg}
-package to use %{pkgname} with GNU Emacs.
-
-
-%package -n xemacs-%{pkg}
-Summary:        Compiled elisp files to run %{pkgname} under XEmacs
-Group:          Development/Languages
-BuildArch:      noarch
-Requires:       xemacs(bin) >= %{_xemacs_version}
-Requires:       xemacs-packages-extra
-
-%description -n xemacs-%{pkg}
-This package contains the byte compiled elisp files to run %{pkgname}
-with XEmacs.
-
-%package -n xemacs-%{pkg}-el
-Summary:        Elisp source files for %{pkgname} under XEmacs
-Group:          Development/Languages
-BuildArch:      noarch
-Requires:       xemacs-%{pkg} = %{version}-%{release}
-
-%description -n xemacs-%{pkg}-el
-This package contains the elisp source files for %{pkgname} under XEmacs. You do
-not need to install this package to run %{pkgname}. Install the xemacs-%{pkg}
-package to use %{pkgname} with XEmacs.
-
-
 %prep
 %setup -q -n %{name}%{version}%{?patch_suffix}
 %patch0
@@ -180,7 +148,7 @@ sed -ri 's/ ?-Wl,-rpath=[^"]+"/"/' configure
 # Enable UTF-8 filename support
 export LOCALE="en_US.utf8"
 export CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -Wno-unused"
-export LDFLAGS="$RPM_LD_FLAGS -Wl,--as-needed"
+export LDFLAGS="-Wl,-z,relro -Wl,--as-needed"
 sed -i -e "s/^jcflags=-O$/jcflags=-deprecation/" configure
 ./configure \
         --prefix=%{_prefix} \
@@ -310,30 +278,16 @@ make test
 %{_libdir}/lib*.so
 %{_infodir}/*
 %{_mandir}/man*/*
+%{_emacs_sitelispdir}/bigloo/
+%{_emacs_sitestartdir}/bigloo.el
+%{_xemacs_sitelispdir}/bigloo/
+%{_xemacs_sitestartdir}/bigloo.el
+%{_xemacs_sitepkgdir}/etc/bigloo/
 %doc Makefile.config examples
 %doc README*
 %license LICENSE COPYING
 
 
-%files -n emacs-bigloo
-%{_emacs_sitelispdir}/bigloo
-%exclude %{_emacs_sitelispdir}/bigloo/*.el
-%{_emacs_sitestartdir}/bigloo.el
-
-%files -n emacs-bigloo-el
-%{_emacs_sitelispdir}/bigloo/*.el
-
-
-%files -n xemacs-bigloo
-%{_xemacs_sitelispdir}/bigloo
-%exclude %{_xemacs_sitelispdir}/bigloo/*.el
-%{_xemacs_sitestartdir}/bigloo.el
-%{_xemacs_sitepkgdir}/etc/bigloo
-
-%files -n xemacs-bigloo-el
-%{_xemacs_sitelispdir}/bigloo/*.el
-
-
 %files libs
 %{_libdir}/lib*.so.0*
 
@@ -343,6 +297,10 @@ make test
 
 
 %changelog
+* Sat Apr 11 2015 Jerry James <loganjerry@gmail.com> - 4.1a-8.2
+- Adapt to new (X)Emacs packaging guidelines
+- Do not link with -z now, breaks the configure script and module loading
+
 * Mon Feb  9 2015 Jerry James <loganjerry@gmail.com> - 4.1a-7.2
 - Fix build failure due to lack of -fPIC
 - Use license macro