diff --git a/python-rpm.changes b/python-rpm.changes
index 724aedc..f7b225e 100644
--- a/python-rpm.changes
+++ b/python-rpm.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Apr  6 14:11:01 CEST 2018 - mls@suse.de
+
+- remove rpmlint-Factory buildignore
+
 -------------------------------------------------------------------
 Tue Mar 20 13:59:45 UTC 2018 - tchvatal@suse.com
 
diff --git a/python-rpm.spec b/python-rpm.spec
index eac0b12..6ca0189 100644
--- a/python-rpm.spec
+++ b/python-rpm.spec
@@ -41,7 +41,6 @@ BuildRequires:  popt-devel
 BuildRequires:  python-rpm-macros
 BuildRequires:  xz-devel
 BuildRequires:  zlib-devel
-#!BuildIgnore:  rpmlint-Factory
 Requires:       rpm = %{version}
 %{expand:%(sed -n -e '/^Source:/,/^BuildRoot:/p' <%{_sourcedir}/rpm.spec)}
 %if "%{python_flavor}" == "python2"
diff --git a/rpm-suse_macros b/rpm-suse_macros
index d681c28..cad114f 100644
--- a/rpm-suse_macros
+++ b/rpm-suse_macros
@@ -222,11 +222,8 @@
 # for %post
 %install_info(:-:) \
     ALL_ARGS=(%{**}) \
-    NUM_ARGS=${#ALL_ARGS[@]} \
     if test -x /sbin/install-info ; then \
-	if test -e "${ALL_ARGS[$((NUM_ARGS-1))]}" ; then \
-	    /sbin/install-info "${ALL_ARGS[@]}" \
-	fi \
+	/sbin/install-info "${ALL_ARGS[@]}" || : \
     fi ;
 
 # for %preun
@@ -234,7 +231,7 @@
     test -n "$FIRST_ARG" || FIRST_ARG=$1 \
     if test -x /sbin/install-info ; then \
 	if [ "$FIRST_ARG" = 0 ]; then \
-	    /sbin/install-info --quiet --delete %{**} \
+	    /sbin/install-info --quiet --delete %{**} || : \
 	fi ; \
     fi ;
 
diff --git a/rpm.changes b/rpm.changes
index 6e973ea..da2f820 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Apr  6 10:05:18 UTC 2018 - adam.majer@suse.de
+
+- %install_info: if we are going to fail, at least fail on install
+  not on attempted upgrades or uninstall [bsc#1084997]
+
 -------------------------------------------------------------------
 Tue Mar 27 14:31:28 CEST 2018 - mls@suse.de