diff --git a/emacs.changes b/emacs.changes
index 22c4d6d..9f3f0d2 100644
--- a/emacs.changes
+++ b/emacs.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Nov 13 09:43:53 UTC 2015 - werner@suse.de
+
+- Make installation of info page info.info more smart, that is if
+  package info already has included it then skip a second installation
+
 -------------------------------------------------------------------
 Tue Nov 10 09:17:53 UTC 2015 - werner@suse.de
 
diff --git a/emacs.spec b/emacs.spec
index 9702d4d..57358f4 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -42,6 +42,9 @@ BuildRequires:  gtk3-devel
 %else
 BuildRequires:  gtk2-devel
 %endif
+# Used for installtion of info pages as well as to
+# detect if the page info.info is part of that package
+BuildRequires:  info
 BuildRequires:  krb5-devel
 BuildRequires:  libacl-devel
 BuildRequires:  libgnutls-devel
@@ -112,6 +115,7 @@ Patch15:        emacs-24.3-iconic.patch
 Patch16:        emacs-24.4-flyspell.patch
 Patch22:        emacs-24.1-bnc628268.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%{expand: %%global include_info %(test -s /usr/share/info/info.info* && echo 0 || echo 1)}
 %{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)}
 %if "%_exec_prefix" == "/usr/X11R6"
 %define _x11lib     %{_exec_prefix}/%{_lib}
@@ -3160,7 +3164,9 @@ fi
 %files       -n emacs-info
 %defattr(-, root, root)
 %doc %{_infodir}/*.gz
+%if 0%{?include_info} == 0
 %exclude %{_infodir}/info.info.gz
+%endif
 
 %files       -n emacs-el
 %defattr(-, root, root)