diff --git a/emacs.changes b/emacs.changes
index e2c731a..3888509 100644
--- a/emacs.changes
+++ b/emacs.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Oct 22 08:45:42 UTC 2014 - werner@suse.de
+
+- Again avoid autoconf and Co.
+
 -------------------------------------------------------------------
 Tue Oct 21 14:47:54 UTC 2014 - werner@suse.de
 
diff --git a/emacs.spec b/emacs.spec
index 0e076c9..e8c9f3e 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -16,7 +16,7 @@
 #
 
 
-%bcond_without  autoconf
+%bcond_with     autoconf
 
 Name:           emacs
 BuildRequires:  ImageMagick
@@ -218,10 +218,25 @@ and most assembler-like syntaxes.
 
 %if %{without autoconf}
 # We don't want to run autoconf
-touch configure src/stamp-h.in
+if test configure.ac -nt aclocal.m4 -o m4/gnulib-comp.m4 -nt aclocal.m4 ; then
+    sleep 1
+    touch aclocal.m4
+fi
+if test configure.ac -nt configure -o aclocal.m4 -nt configure ; then
+    sleep 1
+    touch configure
+fi
+if test configure.ac -nt src/stamp-h.in -o aclocal.m4 -nt src/stamp-h.in ; then
+    sleep 1
+    touch src/stamp-h.in
+fi
+if test aclocal.m4 -nt lib/Makefile.in -o lib/Makefile.am -nt lib/Makefile.in -o lib/gnulib.mk -nt lib/Makefile.in ; then
+    sleep 1
+    touch lib/Makefile.in
+fi
 if test -s autogen.sh ; then
-  mv autogen.sh autogen.sh.no
-  ln -sf /bin/true autogen.sh
+    mv autogen.sh autogen.sh.no
+    ln -sf /bin/true autogen.sh
 fi
 %endif
 
@@ -493,10 +508,13 @@ rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/obsolete/fast-lock.el.flc
 rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/loaddefs.el.flc
 rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/progmodes/python.el.python
 rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/textmodes/flyspell.el.flyspell
-rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/emacs-lisp/find-gc.el.CVE-2014-3422
-rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/gnus/gnus-fun.el.CVE-2014-3421
-rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/net/browse-url.el.CVE-2014-3423
-rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/net/tramp-sh.el.CVE-2014-3424
+rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/obsolete/spell.el.obsolate
+rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/cmuscheme.el.0
+rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/international/mule-cmds.el.0
+rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/net/ange-ftp.el.0
+rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/site-load.el.0
+rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/speedbar.el.0
+rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/textmodes/ispell.el.0
 unelc  %{buildroot}%{_datadir}/emacs/%{version}/lisp/bindings.elc
 unelc  %{buildroot}%{_datadir}/emacs/%{version}/lisp/cus-start.elc
 unelc  %{buildroot}%{_datadir}/emacs/%{version}/lisp/generic-x.elc
@@ -1827,7 +1845,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/cedet/srecode/template.elc
 %{_datadir}/emacs/%{version}/lisp/cedet/srecode/texi.elc
 %{_datadir}/emacs/%{version}/lisp/chistory.elc
-%{_datadir}/emacs/%{version}/lisp/cmuscheme.el.0
 %{_datadir}/emacs/%{version}/lisp/cmuscheme.elc
 %{_datadir}/emacs/%{version}/lisp/color.elc
 %{_datadir}/emacs/%{version}/lisp/comint.elc
@@ -2252,7 +2269,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/international/kkc.elc
 %{_datadir}/emacs/%{version}/lisp/international/latexenc.elc
 %{_datadir}/emacs/%{version}/lisp/international/latin1-disp.elc
-%{_datadir}/emacs/%{version}/lisp/international/mule-cmds.el.0
 %{_datadir}/emacs/%{version}/lisp/international/mule-cmds.elc
 %{_datadir}/emacs/%{version}/lisp/international/mule-conf.elc
 %{_datadir}/emacs/%{version}/lisp/international/mule-diag.elc
@@ -2478,7 +2494,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/msb.elc
 %{_datadir}/emacs/%{version}/lisp/mwheel.elc
 %dir %{_datadir}/emacs/%{version}/lisp/net/
-%{_datadir}/emacs/%{version}/lisp/net/ange-ftp.el.0
 %{_datadir}/emacs/%{version}/lisp/net/ange-ftp.elc
 %{_datadir}/emacs/%{version}/lisp/net/browse-url.elc
 %{_datadir}/emacs/%{version}/lisp/net/dbus.elc
@@ -2611,7 +2626,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/obsolete/resume.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/s-region.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/scribe.elc
-%{_datadir}/emacs/%{version}/lisp/obsolete/spell.el.obsolate
 %{_datadir}/emacs/%{version}/lisp/obsolete/spell.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/sregex.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/sup-mouse.elc
@@ -2883,11 +2897,9 @@ fi
 %{_datadir}/emacs/%{version}/lisp/shell.elc
 %{_datadir}/emacs/%{version}/lisp/simple.elc
 %{_datadir}/emacs/%{version}/lisp/site-load.el
-%{_datadir}/emacs/%{version}/lisp/site-load.el.0
 %{_datadir}/emacs/%{version}/lisp/skeleton.el
 %{_datadir}/emacs/%{version}/lisp/sort.elc
 %{_datadir}/emacs/%{version}/lisp/soundex.elc
-%{_datadir}/emacs/%{version}/lisp/speedbar.el.0
 %{_datadir}/emacs/%{version}/lisp/speedbar.elc
 %{_datadir}/emacs/%{version}/lisp/startup.elc
 %{_datadir}/emacs/%{version}/lisp/strokes.elc
@@ -2945,7 +2957,6 @@ fi
 %{_datadir}/emacs/%{version}/lisp/textmodes/enriched.elc
 %{_datadir}/emacs/%{version}/lisp/textmodes/fill.elc
 %{_datadir}/emacs/%{version}/lisp/textmodes/flyspell.elc
-%{_datadir}/emacs/%{version}/lisp/textmodes/ispell.el.0
 %{_datadir}/emacs/%{version}/lisp/textmodes/ispell.elc
 %{_datadir}/emacs/%{version}/lisp/textmodes/makeinfo.elc
 %{_datadir}/emacs/%{version}/lisp/textmodes/nroff-mode.elc