diff --git a/emacs.changes b/emacs.changes
index 0595017..a3411f8 100644
--- a/emacs.changes
+++ b/emacs.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Mar 12 10:58:34 UTC 2015 - werner@suse.de
+
+- Move deinstall of info files from %postun to %preun (boo#921948)
+
 -------------------------------------------------------------------
 Tue Feb 24 07:08:48 UTC 2015 - meissner@suse.com
 
diff --git a/emacs.spec b/emacs.spec
index 4bd0506..5bdd43b 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package emacs
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -185,7 +185,7 @@ files are pre-byte compiled and therefore not necessary.
 Summary:        Info files for GNU Emacs
 Group:          Productivity/Editors/Emacs
 Requires(post): %install_info_prereq
-Requires(postun): %install_info_prereq
+Requires(preun): %install_info_prereq
 %if 0%{?suse_version} >= 1120
 BuildArch:      noarch
 %endif
@@ -607,7 +607,7 @@ for f in %info_files; do
   %install_info --info-dir=%{_infodir} "%{_infodir}/$f.gz"
 done
 
-%postun info
+%preun info
 for f in %info_files; do
   test -e "$f" || f="${f}.info"
   %install_info_delete --info-dir=%{_infodir} "%{_infodir}/$f.gz"