diff --git a/.gitattributes b/.gitattributes
index ce627c6..673d550 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+git20211206.de24bdf.tar filter=lfs diff=lfs merge=lfs -text
+aaa_base-84.87+git20220221.b62a2cf.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 c919f19..acffa44 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,6 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/openSUSE/aaa_base.git</param>
-              <param name="changesrevision">7fc8c1190fae5b0db879b4080aef7e51961524cd</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">0f8eaba2cf2e69db15cce8a4dcf005b6e88f61e6</param></service><service name="tar_scm">
+                <param name="url">https://github.com/lnussel/aaa_base.git</param>
+              <param name="changesrevision">0f8eaba2cf2e69db15cce8a4dcf005b6e88f61e6</param></service></servicedata>
\ No newline at end of file
diff --git a/aaa_base-84.87+git20211206.de24bdf.tar b/aaa_base-84.87+git20211206.de24bdf.tar
deleted file mode 100644
index 3bacfad..0000000
--- a/aaa_base-84.87+git20211206.de24bdf.tar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a7c19a25835b26d1f45483eb3a8c51f6f2e29326b3b4797f1da31d6ce7e26c89
-size 378880
diff --git a/aaa_base-84.87+git20220221.b62a2cf.tar b/aaa_base-84.87+git20220221.b62a2cf.tar
new file mode 100644
index 0000000..9ee22bc
--- /dev/null
+++ b/aaa_base-84.87+git20220221.b62a2cf.tar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2e3f7105f407555b1ab59fe34fd6c75b41005b357b37e14107c12e276369645f
+size 378880
diff --git a/aaa_base.changes b/aaa_base.changes
index 8302b56..20f2c56 100644
--- a/aaa_base.changes
+++ b/aaa_base.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Feb 21 09:18:44 UTC 2022 - lnussel@suse.de
+
+- Update to version 84.87+git20220221.b62a2cf:
+  * package: Require new enough version of glibc
+  * package: build in place support
+  * drop /etc/ttytype (boo#1191923)
+
 -------------------------------------------------------------------
 Sat Dec 11 16:05:25 UTC 2021 - dleuenberger@suse.com
 
diff --git a/aaa_base.spec b/aaa_base.spec
index 459fb25..e6f8c48 100644
--- a/aaa_base.spec
+++ b/aaa_base.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package aaa_base
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,8 +22,13 @@
   %define _fillupdir /var/adm/fillup-templates
 %endif
 
+%if 0%{?_build_in_place}
+%define git_version %(git log '-n1' '--date=format:%Y%m%d' '--no-show-signature' "--pretty=format:+git%cd.%h")
+BuildRequires:  git-core
+%endif
+
 Name:           aaa_base
-Version:        84.87+git20211206.de24bdf
+Version:        84.87+git20220221.b62a2cf%{?git_version}
 Release:        0
 URL:            https://github.com/openSUSE/aaa_base
 # do not require systemd - aaa_base is in the build environment and we don't
@@ -46,7 +51,7 @@ Recommends:     logrotate
 Recommends:     netcfg
 Recommends:     udev
 Requires(pre):  /usr/bin/rm
-Requires(pre):  glibc >= 2.30
+Requires(pre):  (glibc >= 2.30 if glibc)
 Requires(post): fillup /usr/bin/chmod /usr/bin/chown
 
 Summary:        openSUSE Base Package
@@ -101,19 +106,9 @@ systems.
 
 %prep
 %setup -q
-sed -i 's|actiondir="/usr/lib/initscripts/legacy-actions"|actiondir="%{_libexecdir}/initscripts/legacy-actions"|' \
-    files/usr/sbin/service
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS" CC="%{__cc}" %{?_smp_mflags}
-if test -d patches/$RPM_ARCH; then
-	pushd files
-	for file in ../patches/$RPM_ARCH/*; do
-		patch -p0 --input=$file
-	done
-	find -name "*.orig" | xargs -r rm
-	popd
-fi
 
 %install
 #
@@ -200,7 +195,6 @@ mkdir -p %{buildroot}%{_fillupdir}
 /usr/etc/profile.d/ls.bash
 /usr/etc/profile.d/ls.zsh
 %config /etc/shells
-%config /etc/ttytype
 %ghost %dir /etc/init.d
 %ghost %config(noreplace) /etc/init.d/boot.local
 %ghost %config(noreplace) /etc/init.d/after.local