diff --git a/autoconf-init.el b/autoconf-init.el
new file mode 100644
index 0000000..1c5725d
--- /dev/null
+++ b/autoconf-init.el
@@ -0,0 +1,16 @@
+;; Activate autoconf-mode
+
+;; Uncomment the following code if you feel that autoconf-mode.el does better
+;; job than Emacs's default autoconf.el.
+
+;; (autoload 'autoconf-mode "autoconf-mode"
+;;           "Major mode for editing autoconf files." t)
+;; (setq auto-mode-alist
+;;       (cons '("\.ac\'\|configure\.in\'" . autoconf-mode)
+;;             auto-mode-alist))
+
+;; Activate autotest-mode
+(autoload 'autotest-mode "autotest-mode"
+         "Major mode for editing autotest files." t)
+(setq auto-mode-alist
+      (cons '("\.at\'" . autotest-mode) auto-mode-alist))
diff --git a/autoconf.spec b/autoconf.spec
index cf62e16..b230e0b 100644
--- a/autoconf.spec
+++ b/autoconf.spec
@@ -1,11 +1,12 @@
 Summary:    A GNU tool for automatically configuring source code
 Name:       autoconf
 Version:    2.69
-Release:    19%{?dist}
+Release:    20%{?dist}
 License:    GPLv2+ and GFDL
 Group:      Development/Tools
 Source0:    http://ftpmirror.gnu.org/autoconf/autoconf-%{version}.tar.xz
 Source1:    config.site
+Source2:    autoconf-init.el
 URL:        http://www.gnu.org/software/autoconf/
 BuildArch: noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -64,7 +65,7 @@ their use.
 %setup -q
 
 %build
-%configure
+%configure --with-lispdir=%{_emacs_sitelispdir}/autoconf
 # not parallel safe
 make
 
@@ -78,6 +79,10 @@ make install DESTDIR=%{buildroot}
 mkdir -p %{buildroot}/share
 install -m 0644 %{SOURCE1} %{buildroot}%{_datadir}
 
+# Create file to activate Emacs modes as required
+mkdir -p %{buildroot}%{_emacs_sitestartdir}
+install -p -m 0644 %{SOURCE2} %{buildroot}%{_emacs_sitestartdir}
+
 %post
 /sbin/install-info %{_infodir}/autoconf.info %{_infodir}/dir || :
 
@@ -100,6 +105,10 @@ fi
 %doc AUTHORS COPYING* ChangeLog NEWS README THANKS TODO
 
 %changelog
+* Fri Jun 26 2015 Pavel Raiskup <praiskup@redhat.com> - 2.69-20
+- conform to Packaging:Emacs guidelines (#1204274), init script
+  by Jonathan Underwood
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.69-19
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild