diff --git a/gpgme.changes b/gpgme.changes
index d734b37..6a15633 100644
--- a/gpgme.changes
+++ b/gpgme.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jun 19 08:08:55 UTC 2015 - astieger@suse.com
+
+- fix install-info for clean uninstall [boo#935339]
+
 -------------------------------------------------------------------
 Mon Jun  8 13:39:26 UTC 2015 - astieger@suse.com
 
diff --git a/gpgme.spec b/gpgme.spec
index cde0468..2979733 100644
--- a/gpgme.spec
+++ b/gpgme.spec
@@ -32,7 +32,8 @@ Source99:       %{name}.changes
 BuildRequires:  gpg2 >= 2.0.10
 BuildRequires:  libassuan-devel >= 2.0.2
 BuildRequires:  libgpg-error-devel >= 1.11
-PreReq:         %install_info_prereq
+Requires(post): %{install_info_prereq}
+Requires(preun): %{install_info_prereq}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -111,16 +112,13 @@ make %{?_smp_mflags}
 %install
 %make_install
 # Do this now to make /usr/lib/rpm/brp-chuck-la happy:
-rm %{buildroot}/%{_libdir}/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
 
 %check
 %if ! 0%{?qemu_user_space_build}
 #make check
 %endif
 
-%clean
-rm -rf %{buildroot}
-
 %post -n libgpgme11 -p /sbin/ldconfig
 
 %postun -n libgpgme11 -p /sbin/ldconfig
@@ -128,7 +126,7 @@ rm -rf %{buildroot}
 %post
 %install_info --info-dir=%{_infodir} %{_infodir}/gpgme.info.gz
 
-%postun
+%preun
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/gpgme.info.gz
 
 %files