diff --git a/.gitattributes b/.gitattributes
index f0adce6..89b60c1 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -22,4 +22,4 @@
 *.zip filter=lfs diff=lfs merge=lfs -text
 *.zst filter=lfs diff=lfs merge=lfs -text
 ## Specific LFS patterns
-aaa_base-84.87+git20211201.a7476cc.tar filter=lfs diff=lfs merge=lfs -text
+aaa_base-84.87+git20211201.2eab642.tar filter=lfs diff=lfs merge=lfs -text
diff --git a/README.packaging.txt b/README.packaging.txt
index 584f754..cb0a539 100644
--- a/README.packaging.txt
+++ b/README.packaging.txt
@@ -1,15 +1,10 @@
-This package should use just the content of the git tree. If you need
-to make changes, you have the following options:
-* Make them in git and update the package from git (you can send merge
-  request if you don't have write access)
-* Create a patch, add the patch to the package and let one of the
-  aaa_base packagers commit it for you
-
-The online repository is at:
+This package is maintained in git at
 http://github.com/openSUSE/aaa_base
 
-For building the package from git run the service directly:
-osc service disabledrun
+Please file a pull request for any changes. The spec file is also in
+git.
 
-Note that aaa_base.spec and aaa_base.changes are not part of the git
-repo.
+For building the package from git you have to adjust the _service
+file to point at the right branch, then call
+
+osc service manualrun
diff --git a/_service b/_service
index 43e0897..080e4cd 100644
--- a/_service
+++ b/_service
@@ -6,6 +6,8 @@
     <param name="scm">git</param>
     <param name="changesgenerate">enable</param>
     <param name="extract">aaa_base.spec</param>
+    <param name="extract">aaa_base-rpmlintrc</param>
+    <param name="extract">README.packaging.txt</param>
   </service>
   <service name="set_version" mode="manual"/>
 </services>
diff --git a/_servicedata b/_servicedata
index c16c9d9..74e2239 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/openSUSE/aaa_base.git</param>
-              <param name="changesrevision">a7476cc91b4eba18939c0948b954b20b83f49a19</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">1e0c192fd0c70956520671d5b370459a0b452af8</param></service></servicedata>
\ No newline at end of file
diff --git a/aaa_base-84.87+git20211201.2eab642.tar b/aaa_base-84.87+git20211201.2eab642.tar
new file mode 100644
index 0000000..7ce7417
--- /dev/null
+++ b/aaa_base-84.87+git20211201.2eab642.tar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ae603507180f6167c081f8a4c939288ee09e935d7ea223cef0cdc3986c4672b5
+size 378880
diff --git a/aaa_base-84.87+git20211201.a7476cc.tar b/aaa_base-84.87+git20211201.a7476cc.tar
deleted file mode 100644
index 5db2ba3..0000000
--- a/aaa_base-84.87+git20211201.a7476cc.tar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e66466e8e18777523aa8ecd19ef2baa642e8e73765a3dd82607aab29c6b7540d
-size 378880
diff --git a/aaa_base.changes b/aaa_base.changes
index 14166e2..d935a23 100644
--- a/aaa_base.changes
+++ b/aaa_base.changes
@@ -1,7 +1,11 @@
 -------------------------------------------------------------------
-Wed Dec 01 09:10:36 UTC 2021 - lnussel@suse.de
+Wed Dec 01 11:54:55 UTC 2021 - lnussel@suse.de
 
-- Update to version 84.87+git20211201.a7476cc:
+- Update to version 84.87+git20211201.2eab642:
+  * Remove legacy usrmerged sections
+  * Add rpmlintrc and README from OBS too
+  * Fix osc service instructions
+  * Add obs workflow for git integration
   * Adopt upstream way of setting rp_filter and promote_secondaries
   * Don't fail if net.ipv4.ping_group_range can't be set
   * Get spec file from git
diff --git a/aaa_base.spec b/aaa_base.spec
index 1d89f8a..e79998d 100644
--- a/aaa_base.spec
+++ b/aaa_base.spec
@@ -23,7 +23,7 @@
 %endif
 
 Name:           aaa_base
-Version:        84.87+git20211201.a7476cc
+Version:        84.87+git20211201.2eab642
 Release:        0
 URL:            https://github.com/openSUSE/aaa_base
 # do not require systemd - aaa_base is in the build environment and we don't
@@ -118,9 +118,6 @@ fi
 %install
 #
 make DESTDIR=$RPM_BUILD_ROOT install
-%if 0%{?usrmerged}
-rm -f %{buildroot}/sbin/*
-%endif
 #
 mkdir -p %{buildroot}/etc/sysctl.d
 case "$RPM_ARCH" in
@@ -233,11 +230,6 @@ mkdir -p %{buildroot}%{_fillupdir}
 %{_fillupdir}/sysconfig.language
 %{_fillupdir}/sysconfig.proxy
 %{_fillupdir}/sysconfig.windowmanager
-%if !0%{?usrmerged}
-/sbin/service
-/sbin/refresh_initrd
-/sbin/smart_agetty
-%endif
 
 %files extras
 %defattr(-,root,root)