diff --git a/docbook_4-README.SuSE b/docbook_4-README.SUSE
similarity index 100%
rename from docbook_4-README.SuSE
rename to docbook_4-README.SUSE
diff --git a/docbook_4.changes b/docbook_4.changes
index 579d8bd..90f8381 100644
--- a/docbook_4.changes
+++ b/docbook_4.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Feb 19 09:42:19 UTC 2015 - toms@opensuse.org
+
+- Fixed subtle XML catalog bug (bsc#918565)
+- Renamed docbook_4-README.SuSE  -> docbook_4-README.SUSE to
+  avoid rpmlint warnings
+
 -------------------------------------------------------------------
 Mon Jul 15 06:02:47 UTC 2013 - toms@opensuse.org
 
diff --git a/docbook_4.spec b/docbook_4.spec
index 7bba73a..bc18ad6 100644
--- a/docbook_4.spec
+++ b/docbook_4.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package docbook_4
 #
-# Copyright (c) 2013 SUSE LINUX Products 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
@@ -32,7 +32,7 @@ License:        BSD-3-Clause and MIT
 Group:          Productivity/Publishing/DocBook
 Version:        4.5
 Release:        0
-Source2:        docbook_4-README.SuSE
+Source2:        docbook_4-README.SUSE
 Source7:        CATALOG.docbook_4
 # DocBook 4.1
 Source410:      http://www.oasis-open.org/docbook/sgml/4.1/docbk41.zip
@@ -101,7 +101,7 @@ Schema.
 
 %prep
 %setup -n %{name} -c -T
-cp -p $RPM_SOURCE_DIR/%{name}-README.SuSE README.SuSE
+cp -p $RPM_SOURCE_DIR/%{name}-README.SUSE README.SUSE
 %{INSTALL_DIR} dtd/4.{1,2,3,4,5} 4.{1,2,3,4,5}xml
 echo "**** %{S:410}"
 pushd dtd/4.1
@@ -359,10 +359,14 @@ if [ -x %{regcat} ]; then
       >/dev/null 2>&1 || true
   done
 fi
-if [ -x /usr/bin/edit-xml-catalog ]; then
+
+# in case of an update, remove old
+if [ "2" = "$1" ]; then
   /usr/bin/edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
-      --add /etc/xml/%{FOR_ROOT_CAT}
+      --del %{name}-%{version} || true
 fi
+/usr/bin/edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
+      --add /etc/xml/%{FOR_ROOT_CAT}
 
 %postun
 if [ "$1" = "0" -a -x %{regcat} ]; then
@@ -372,7 +376,7 @@ if [ "$1" = "0" -a -x %{regcat} ]; then
   done
 fi
 # remove entries only on removal of file
-if [ ! -f %{xml_sysconf_dir}/%{FOR_ROOT_CAT} -a -x /usr/bin/edit-xml-catalog ] ; then
+if [ "0" = "$1" -a ! -f %{xml_sysconf_dir}/%{FOR_ROOT_CAT} ] ; then
   /usr/bin/edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
       --del %{name}-%{version}
 fi
@@ -380,7 +384,7 @@ fi
 %files
 %defattr(-, root, root)
 %config %{sgml_config_dir}/CATALOG.*
-%doc README.SuSE
+%doc README.SUSE
 %{sgml_dir}/CATALOG.*
 %{sgml_docbook_dtd_dir}/4.1
 %{sgml_docbook_dtd_dir}/4.2