diff --git a/sgml-skel-edit-cat.diff b/sgml-skel-edit-cat.diff
new file mode 100644
index 0000000..7b298e0
--- /dev/null
+++ b/sgml-skel-edit-cat.diff
@@ -0,0 +1,35 @@
+--- edit-xml-catalog.sh	2008-05-14 13:28:16.000000000 +0200
++++ edit-xml-catalog.sh	2008-05-14 13:54:11.000000000 +0200
+@@ -61,10 +61,8 @@
+ if [ "$ROOTCATALOG" != /etc/xml/catalog ]; then
+   root=${ROOTCATALOG#/etc/xml/}
+   if ! grep -q "nextCatalog.*catalog=\"${root}\"" /etc/xml/catalog; then
+-    cp /etc/xml/catalog /etc/xml/catalog.tmp
+-    sed "/<\/catalog>/i\\
+-<nextCatalog catalog=\"${root}\"/>" \
+-      /etc/xml/catalog.tmp >/etc/xml/catalog
++    sed -i "/<\/catalog>/i\\
++<nextCatalog catalog=\"${root}\"/>" /etc/xml/catalog
+   fi
+   prep_catalog "$ROOTCATALOG"
+ fi
+@@ -79,6 +77,9 @@
+ /<catalog/{s=1}
+ END{print "</catalog>"}'
+   } >$ROOTCATALOG.tmp
++  if [ -x /bin/chmod ]; then
++    /bin/chmod --reference=$ROOTCATALOG $ROOTCATALOG.tmp
++  fi
+   $xmllint --nocatalogs --noout $ROOTCATALOG.tmp \
+     && mv $ROOTCATALOG.tmp $ROOTCATALOG
+ }
+@@ -104,6 +105,9 @@
+ /<!-- pac_start: $pattern do not remove! -->/{s=1;next}
+ {print}" > $ROOTCATALOG.tmp
+     fi
++    if [ -x /bin/chmod ]; then
++      /bin/chmod --reference=$ROOTCATALOG $ROOTCATALOG.tmp
++    fi
+     $xmllint --nocatalogs --noout $ROOTCATALOG.tmp \
+       && mv $ROOTCATALOG.tmp $ROOTCATALOG
+   fi
diff --git a/sgml-skel.changes b/sgml-skel.changes
index 3e1ab33..02b5070 100644
--- a/sgml-skel.changes
+++ b/sgml-skel.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed May 14 13:58:15 CEST 2008 - ke@suse.de
+
+- sgml-skel-edit-cat.diff: Edit catalog file in place; try to keep file
+  permissions.  Reported by Jörg Mayer [bnc#386791].
+
 -------------------------------------------------------------------
 Mon May 14 10:30:40 CEST 2007 - ke@suse.de
 
diff --git a/sgml-skel.spec b/sgml-skel.spec
index 6f30a84..bf8148f 100644
--- a/sgml-skel.spec
+++ b/sgml-skel.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package sgml-skel (Version 0.6)
 #
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -10,17 +10,19 @@
 
 # norootforbuild
 
+
 Name:           sgml-skel
 BuildRequires:  libxml2
 Summary:        Helper Scripts for the SGML System
 Version:        0.6
-Release:        318
+Release:        386
 Group:          Productivity/Publishing/SGML
 Requires:       libxml2
 PreReq:         /bin/awk
 PreReq:         /bin/mv
+PreReq:         /bin/chmod
 #Provides: 
-License:        GNU General Public License (GPL)
+License:        GPL v2 or later
 # URL: 
 Source0:        http://www.suse.de/~ke/%{name}/%{name}-%{version}.tar.bz2
 # :pserver:anoncvs@sources.redhat.com:/cvs/docbook-tools
@@ -28,8 +30,9 @@ Source1:        docbook-tools/sgml-common/bin/install-catalog.in
 Source2:        edit-xml-catalog.sh
 Patch:          sgml-skel-regcat.diff
 Patch1:         sgml-skel-regcat2.diff
+Patch2:         sgml-skel-edit-cat.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildArchitectures: noarch
+BuildArch:      noarch
 
 %description
 These scripts will help prepare and maintain parts of an SGML system.
@@ -46,6 +49,7 @@ Authors:
 %define INSTALL_SCRIPT install -m755
 %define INSTALL_DIR install -d -m755
 %define INSTALL_DATA install -m644
+
 %prep
 %setup -q
 %patch -p 1
@@ -53,6 +57,7 @@ Authors:
 # # cp -p $RPM_SOURCE_DIR/%{name}-README.SuSE .
 cp %{S:1} .
 cp %{S:2} .
+%patch2 -p 0
 
 %build
 # CFLAGS="$RPM_OPT_FLAGS"
@@ -92,82 +97,85 @@ rm -fr $RPM_BUILD_ROOT
 %dir /var/lib/sgml
 
 %changelog
-* Mon May 14 2007 - ke@suse.de
+* Wed May 14 2008 ke@suse.de
+- sgml-skel-edit-cat.diff: Edit catalog file in place; try to keep file
+  permissions.  Reported by Jörg Mayer [bnc#386791].
+* Mon May 14 2007 ke@suse.de
 - PreReq /bin/mv . Reported by Andreas Jaeger [#274128].
-* Mon Jan 29 2007 - ke@suse.de
+* Mon Jan 29 2007 ke@suse.de
 - Fix debug code in edit-xml-catalog.  Reported by Andreas Hanke and
   Dirk Mueller [# 237652].
-* Mon Aug 14 2006 - ke@suse.de
+* Mon Aug 14 2006 ke@suse.de
 - Provide /etc/xml/catalog.
 - SuSEconfig.sgml-skel: Remove it.  It was required to solve on update
   issue while introducing the /usr/share/xml hierarchy.  It is obsolete
   now.
-* Wed Jan 25 2006 - mls@suse.de
+* Wed Jan 25 2006 mls@suse.de
 - converted neededforbuild to BuildRequires
-* Mon Jul 04 2005 - ke@suse.de
+* Mon Jul 04 2005 ke@suse.de
 - PreReq /bin/awk; reported by Marco Michna [# 94798].
-* Fri Jun 24 2005 - ke@suse.de
+* Fri Jun 24 2005 ke@suse.de
 - Add %%{_sysconfdir}/xml/suse-catalog.xml and mark it as %%ghost.
-* Mon Jun 20 2005 - schwab@suse.de
+* Mon Jun 20 2005 schwab@suse.de
 - Mark %%{_sysconfdir}/sgml/catalog as %%ghost and remove %%pre.
-* Fri Nov 12 2004 - mmj@suse.de
+* Fri Nov 12 2004 mmj@suse.de
 - cp used in %%pre so add to PreReq:
-* Wed Aug 25 2004 - ke@suse.de
+* Wed Aug 25 2004 ke@suse.de
 - edit-xml-catalog.sh: Drop dependency on getopt to avoid adding more
   PreReqs in packages depending on sgml-skel.  Reported by Thorsten
   Kukuk [# 44154].
-* Mon Feb 23 2004 - hmacht@suse.de
+* Mon Feb 23 2004 hmacht@suse.de
 - building as non-root
-* Thu Feb 12 2004 - ke@suse.de
+* Thu Feb 12 2004 ke@suse.de
 - Fix tei-xsl link.
 - Add svg-dtd links.
-* Wed Feb 11 2004 - ke@suse.de
+* Wed Feb 11 2004 ke@suse.de
 - Correct resp. change some links; add tei-xsl-stylesheets.
-* Thu Feb 05 2004 - ke@suse.de
+* Thu Feb 05 2004 ke@suse.de
 - Correct docbook-xsl-stylesheets related compat links.
 - Add links for mathml-dtd.
-* Fri Jan 30 2004 - ke@suse.de
+* Fri Jan 30 2004 ke@suse.de
 - Also create docbook-xsl-stylesheets related compat links (FHS 2.3
   related change).
-* Fri Jan 23 2004 - ke@suse.de
+* Fri Jan 23 2004 ke@suse.de
 - Add SuSEconfig.sgml-skel: In case of an update provide compatibility
   links.
-* Thu Jul 31 2003 - meissner@suse.de
+* Thu Jul 31 2003 meissner@suse.de
 - autoreconf -i -f, so the --build arch switch detects ppc64.
-* Fri Jun 13 2003 - ke@suse.de
+* Fri Jun 13 2003 ke@suse.de
 - Drop /usr/share/sgml from and add /etc/xml to %%files.
-* Tue Apr 29 2003 - ke@suse.de
+* Tue Apr 29 2003 ke@suse.de
 - Add option --group to build <group>...</group> sections with id
   attributes in catalog files.
-* Mon Apr 28 2003 - ke@suse.de
+* Mon Apr 28 2003 ke@suse.de
 - Add option --catalog to allow editing arbitrary catalog files.
-* Mon Apr 28 2003 - ke@suse.de
+* Mon Apr 28 2003 ke@suse.de
 - Add edit-xml-catalog.sh, a script for editing /etc/xml/catalog.
-* Wed Dec 11 2002 - ke@suse.de
+* Wed Dec 11 2002 ke@suse.de
 - sgml-skel-regcat2.diff: Don't register catalogs twice.
-* Mon Nov 25 2002 - ke@suse.de
+* Mon Nov 25 2002 ke@suse.de
 - Update to version 0.6:
   * New script: sgml-register-catalog.
 - sgml-skel-regcat.diff: Remove subcatalog without checking unrelated
   stuff.
-* Thu Nov 21 2002 - ke@suse.de
+* Thu Nov 21 2002 ke@suse.de
 - /etc/sgml/catalog now belongs to this package; preserve backup in case
   sgmltools-lite owns it at the same time.
 - Install install-catalog without suffix.
-* Tue Nov 19 2002 - ke@suse.de
+* Tue Nov 19 2002 ke@suse.de
 - Add install-catalog.sh (from CVS:docbook-tools/sgml-common).
-* Mon May 27 2002 - ke@suse.de
+* Mon May 27 2002 ke@suse.de
 - Update to version 0.5:
   - New scripts: sgml2xmlcat.sh (re-written, replacement for
   sgmlcat2x.sh) and parse-sgml-catalog.sh to normalized SGML Open
   catalogs.
-* Mon May 06 2002 - ke@suse.de
+* Mon May 06 2002 ke@suse.de
 - Add sgmlcat2x.sh to parse normalized traditional SGML catalog files.
-* Mon Aug 27 2001 - ke@suse.de
+* Mon Aug 27 2001 ke@suse.de
 - Update to version 0.2 (now it's a proper package):
   - Recognize ISO identifiers (additionally to '-//' and '+//' owner
   tags).
   - Handle language and version field.
   - More error checking.
-* Thu Mar 22 2001 - ke@suse.de
+* Thu Mar 22 2001 ke@suse.de
 - New package.