diff --git a/_service b/_service
index 35cf23c..45b6a39 100644
--- a/_service
+++ b/_service
@@ -5,6 +5,7 @@
 		<param name="parent-tag">e56ce28a20ccfa1d37d3b66eb943bd12922b61ae</param>
 		<param name="versionformat">0.g@TAG_OFFSET@</param>
 		<param name="changesgenerate">enable</param>
+		<param name="extract">package/rpm-config-SUSE.spec</param>
 	</service>
 	<service name="recompress" mode="disabled">
 		<param name="file">*.tar</param>
diff --git a/rpm-config-SUSE.spec b/rpm-config-SUSE.spec
index ba54dd3..3d6c522 100644
--- a/rpm-config-SUSE.spec
+++ b/rpm-config-SUSE.spec
@@ -22,9 +22,9 @@ Version:        0.g76
 Release:        0
 Summary:        SUSE specific RPM configuration files
 License:        GPL-2.0-or-later
-Group:          Development/Tools/Building
+Group:          System/Packages
 URL:            https://github.com/openSUSE/rpm-config-SUSE
-Source:         %{name}-%{version}.tar.xz
+Source:         %{name}-%{version}.tar.gz
 
 # RPM owns the directories we need
 Requires:       rpm
@@ -48,6 +48,11 @@ sed -e 's/@suse_version@/%{?suse_version}%{!?suse_version:0}/' \
     -e 's/@is_opensuse@/%{?is_opensuse}%{!?is_opensuse:0}/' \
     -e '/@leap_version@%{?leap_version:nomatch}/d' \
     -e 's/@leap_version@/%{?leap_version}%{!?leap_version:0}/' \
+%if 0%{?usrmerged}
+    -e 's/@usrmerged@/%{?usrmerged}/' \
+%else
+    -e '/@usrmerged@/d' \
+%endif
 %if 0%{?is_opensuse}
     -e '/@sle_version@%{?sle_version:nomatch}/d' \
     -e 's/@sle_version@/%{?sle_version}%{!?sle_version:0}/' \