diff --git a/util-linux.changes b/util-linux.changes
index 33983b0..da72d28 100644
--- a/util-linux.changes
+++ b/util-linux.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Jan  6 09:27:26 UTC 2023 - Dirk Müller <dmueller@suse.com>
+
+- restore man and info pages
+- clean up spec file slightly 
+
+-------------------------------------------------------------------
+Tue Dec 27 13:23:29 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
+
+- Replace transitional %usrmerged macro with regular version check (boo#1206798)
+
 -------------------------------------------------------------------
 Wed Dec 21 17:11:27 UTC 2022 - Dirk Müller <dmueller@suse.com>
 
diff --git a/util-linux.spec b/util-linux.spec
index 8b646bc..ed93c0e 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package util-linux
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -40,7 +40,7 @@
 %define ulbuild python
 %endif
 
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 %define ul_extra_bin_sbin 1
 %else
 %define ul_extra_bin_sbin 0
@@ -55,21 +55,6 @@
 %define no_config 1
 %endif
 
-%define ulprefix %{_prefix}
-%define ulexecprefix %{_exec_prefix}
-%define ulbindir %{_bindir}
-%define ullibdir %{_libdir}
-%define ullibexecdir %{_libexecdir}
-%define ulincludedir %{_includedir}
-%define ulsbindir %{_sbindir}
-%define uldatadir %{_datadir}
-%define ulmandir %{_mandir}
-%define ulinfodir %{_infodir}
-%define uldocdir %{_docdir}
-%define uldistconfdir %{_distconfdir}
-%define ulsysconfdir %{_sysconfdir}
-%define ulpamdir %{_pam_vendordir}
-
 %if "%ulbuild" == "base"
 %if "%ulsubset" == "core"
 Name:           util-linux
@@ -395,19 +380,19 @@ function configure_and_build() {
 # All dirs needs to be specified, as %%configure does not derive them
 # from %%_prefix, and bootstrap build will fall back to /usr.
 %configure\
-	--prefix=%{ulprefix}\
-	--exec-prefix=%{ulexecprefix}\
+	--prefix=%{_prefix}\
+	--exec-prefix=%{_exec_prefix}\
 	--disable-silent-rules\
-	--bindir=%{ulbindir}\
-	--sbindir=%{ulsbindir}\
-	--sysconfdir=%{ulsysconfdir}\
-	--datadir=%{uldatadir}\
-	--includedir=%{ulincludedir}\
-	--libdir=%{ullibdir}\
-	--libexecdir=%{ullibexecdir}\
-	--mandir=%{ulmandir}\
-	--infodir=%{ulinfodir}\
-	--docdir=%{uldocdir}/%{name}\
+	--bindir=%{_bindir}\
+	--sbindir=%{_sbindir}\
+	--sysconfdir=%{_sysconfdir}\
+	--datadir=%{_datadir}\
+	--includedir=%{_includedir}\
+	--libdir=%{_libdir}\
+	--libexecdir=%{_libexecdir}\
+	--mandir=%{_mandir}\
+	--infodir=%{_infodir}\
+	--docdir=%{_docdir}/%{name}\
 	--disable-makeinstall-chown\
 	--disable-makeinstall-setuid\
 	--with-audit\
@@ -417,7 +402,7 @@ function configure_and_build() {
 	--with-readline\
 	--with-selinux\
 	--with-utempter\
-	--with-bashcompletiondir=%{uldatadir}/bash-completion/completions\
+	--with-bashcompletiondir=%{_datadir}/bash-completion/completions\
 	--with-systemdsystemunitdir=%{_unitdir}\
 	--enable-libuuid-force-uuidd\
 	--enable-sulogin-emergency-mount\
@@ -444,7 +429,7 @@ function configure_and_build() {
 %endif
 	--without-python\
 %endif
-	--with-vendordir=%{uldistconfdir}
+	--with-vendordir=%{_distconfdir}
 make %{?_smp_mflags}
 }
 %if "%ulbuild" == "base"
@@ -481,50 +466,50 @@ cd ..
 %install
 %if "%ulbuild" == "base"
 %make_install
-mkdir -p %{buildroot}{%{uldistconfdir}/default,%{ulpamdir},%{ulsysconfdir}/issue.d}
-install -m 644 %{SOURCE51} %{buildroot}%{ulsysconfdir}/blkid.conf
-install -m 644 %{SOURCE8} %{buildroot}%{ulpamdir}/login
-install -m 644 %{SOURCE9} %{buildroot}%{ulpamdir}/remote
-install -m 644 %{SOURCE14} %{buildroot}%{ulpamdir}/runuser
-install -m 644 %{SOURCE15} %{buildroot}%{ulpamdir}/runuser-l
-install -m 644 %{SOURCE10} %{buildroot}%{ulpamdir}/su
-install -m 644 %{SOURCE16} %{buildroot}%{ulpamdir}/su-l
-install -m 644 %{SOURCE11} %{buildroot}%{uldistconfdir}/default/su
+mkdir -p %{buildroot}{%{_distconfdir}/default,%{_pam_vendordir},%{_sysconfdir}/issue.d}
+install -m 644 %{SOURCE51} %{buildroot}%{_sysconfdir}/blkid.conf
+install -m 644 %{SOURCE8} %{buildroot}%{_pam_vendordir}/login
+install -m 644 %{SOURCE9} %{buildroot}%{_pam_vendordir}/remote
+install -m 644 %{SOURCE14} %{buildroot}%{_pam_vendordir}/runuser
+install -m 644 %{SOURCE15} %{buildroot}%{_pam_vendordir}/runuser-l
+install -m 644 %{SOURCE10} %{buildroot}%{_pam_vendordir}/su
+install -m 644 %{SOURCE16} %{buildroot}%{_pam_vendordir}/su-l
+install -m 644 %{SOURCE11} %{buildroot}%{_distconfdir}/default/su
 sed 's/\bsu\b/runuser/g' <%{SOURCE11} >runuser.default
-install -m 644 runuser.default %{buildroot}%{uldistconfdir}/default/runuser
-rm -fv "%{buildroot}/%{ulsbindir}/raw" "%{buildroot}/sbin/raw" \
-	"%{buildroot}/%{ulmandir}/man8/raw.8"*
-install -m 644 %{SOURCE6} %{buildroot}%{ulsysconfdir}/filesystems
-echo -e "#!/bin/sh\n/sbin/blockdev --flushbufs \$1" > %{buildroot}%{ulsbindir}/flushb
-chmod 755 %{buildroot}%{ulsbindir}/flushb
+install -m 644 runuser.default %{buildroot}%{_distconfdir}/default/runuser
+rm -fv "%{buildroot}/%{_sbindir}/raw" "%{buildroot}/sbin/raw" \
+	"%{buildroot}/%{_mandir}/man8/raw.8"*
+install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/filesystems
+echo -e "#!/bin/sh\n/sbin/blockdev --flushbufs \$1" > %{buildroot}%{_sbindir}/flushb
+chmod 755 %{buildroot}%{_sbindir}/flushb
 # arch dependent
 %ifarch s390 s390x
-rm -f %{buildroot}%{ulsysconfdir}/fdprm
-rm -f %{buildroot}%{ulbindir}/setterm
-rm -f %{buildroot}%{ulsbindir}/fdformat
-rm -f %{buildroot}%{ulsbindir}/hwclock
-rm -f %{buildroot}%{ulsbindir}/tunelp
-rm -f %{buildroot}%{ulmandir}/man8/fdformat.8*
-rm -f %{buildroot}%{ulmandir}/man8/hwclock.8*
-rm -f %{buildroot}%{ulmandir}/man8/tunelp.8*
+rm -f %{buildroot}%{_sysconfdir}/fdprm
+rm -f %{buildroot}%{_bindir}/setterm
+rm -f %{buildroot}%{_sbindir}/fdformat
+rm -f %{buildroot}%{_sbindir}/hwclock
+rm -f %{buildroot}%{_sbindir}/tunelp
+rm -f %{buildroot}%{_mandir}/man8/fdformat.8*
+rm -f %{buildroot}%{_mandir}/man8/hwclock.8*
+rm -f %{buildroot}%{_mandir}/man8/tunelp.8*
 %endif
 %ifarch ia64 %sparc m68k
-rm -f %{buildroot}%{ulmandir}/man8/cfdisk.8*
-rm -f %{buildroot}%{ulmandir}/man8/sfdisk.8*
-rm -f %{buildroot}%{ulsbindir}/cfdisk
-rm -f %{buildroot}%{ulsbindir}/sfdisk
+rm -f %{buildroot}%{_mandir}/man8/cfdisk.8*
+rm -f %{buildroot}%{_mandir}/man8/sfdisk.8*
+rm -f %{buildroot}%{_sbindir}/cfdisk
+rm -f %{buildroot}%{_sbindir}/sfdisk
 %endif
 %ifarch ia64 m68k
-rm -f %{buildroot}%{ulsbindir}/fdisk
-rm -f %{buildroot}%{ulmandir}/man8/fdisk.8*
+rm -f %{buildroot}%{_sbindir}/fdisk
+rm -f %{buildroot}%{_mandir}/man8/fdisk.8*
 %endif
 # create list of setarch(8) symlinks
-find  %{buildroot}%{ulmandir}/man8 -regextype posix-egrep  \
+find  %{buildroot}%{_mandir}/man8 -regextype posix-egrep  \
   -regex ".*(linux32|linux64|s390|s390x|i386|ppc|ppc64|ppc32|sparc|sparc64|sparc32|sparc32bash|mips|mips64|mips32|ia64|x86_64|parisc|parisc32|parisc64)\.8.*" \
-  -printf "%{ulmandir}/man8/%f*\n" >> %{name}.files
-find  %{buildroot}%{ulbindir}/ -regextype posix-egrep -type l \
+  -printf "%{_mandir}/man8/%f*\n" >> %{name}.files
+find  %{buildroot}%{_bindir}/ -regextype posix-egrep -type l \
   -regex ".*(linux32|linux64|s390|s390x|i386|ppc|ppc64|ppc32|sparc|sparc64|sparc32|sparc32bash|mips|mips64|mips32|ia64|x86_64|parisc|parisc32|parisc64)$" \
-  -printf "%{ulbindir}/%f\n" >> %{name}.files
+  -printf "%{_bindir}/%f\n" >> %{name}.files
 mkdir -p %{buildroot}%{_sharedstatedir}/libuuid
 mkdir -p %{buildroot}/run/uuidd
 # clock.txt from uuidd is a ghost file
@@ -532,27 +517,27 @@ touch %{buildroot}%{_sharedstatedir}/libuuid/clock.txt
 %if %{ul_extra_bin_sbin}
 mkdir -p %{buildroot}{/bin,/sbin}
 for i in dmesg findmnt kill logger lsblk more mount su umount; do
-	if test -f "%{buildroot}%{ulbindir}/$i" ; then
-		ln -s "%{ulbindir}/$i" "%{buildroot}/bin/"
+	if test -f "%{buildroot}%{_bindir}/$i" ; then
+		ln -s "%{_bindir}/$i" "%{buildroot}/bin/"
 	fi
 done
 for i in agetty blockdev cfdisk ctrlaltdel fdisk fsck.minix fsck.cramfs\
  hwclock losetup mkfs mkfs.bfs mkfs.minix mkfs.cramfs mkswap nologin\
  pivot_root raw sfdisk swapoff swapon blkid findfs fsck switch_root\
  wipefs fsfreeze swaplabel fstrim chcpu; do
-	if test -f "%{buildroot}%{ulsbindir}/$i" ; then
-		ln -s "%{ulsbindir}/$i" "%{buildroot}/sbin/"
+	if test -f "%{buildroot}%{_sbindir}/$i" ; then
+		ln -s "%{_sbindir}/$i" "%{buildroot}/sbin/"
 	fi
 done
 # login is always and only in /bin
-mv %{buildroot}%{ulbindir}/login %{buildroot}/bin/
+mv %{buildroot}%{_bindir}/login %{buildroot}/bin/
 %endif
 %if "%ulsubset" == "core"
 %find_lang %{_name} %{name}.lang
 %else
 echo -n "" >%{name}.lang
-ln -sf /sbin/service %{buildroot}%{ulsbindir}/rcuuidd
-ln -sf /sbin/service %{buildroot}%{ulsbindir}/rcfstrim
+ln -sf /sbin/service %{buildroot}%{_sbindir}/rcuuidd
+ln -sf /sbin/service %{buildroot}%{_sbindir}/rcfstrim
 %endif
 %endif
 %if "%ulbuild" == "python"
@@ -562,10 +547,10 @@ rm %{buildroot}%{$python_sitearch}/libmount/*.*a
 cd ..
 }
 # There is a limitation: python module needs to build much more, and install even more. Delete it.
-rm -r %{buildroot}{%{ulbindir},%{ulmandir},%{uldatadir},%{ulincludedir},%{ullibdir}/{lib,pkg}*}
+rm -r %{buildroot}{%{_bindir},%{_mandir},%{_datadir},%{_includedir},%{_libdir}/{lib,pkg}*}
 %endif
 # Link duplicate manpages or python bindings.
-%fdupes -s %{buildroot}%{ulprefix}
+%fdupes -s %{buildroot}%{_prefix}
 
 %if "%ulbuild" == "base"
 %if "%ulbuild" != "python"
@@ -612,8 +597,8 @@ exit "$result"
 
 %if "%ulsubset" == "core"
 %verifyscript
-%verify_permissions -e %{ulbindir}/wall -e %{ulbindir}/write -e %{ulbindir}/mount -e %{ulbindir}/umount
-%verify_permissions -e %{ulbindir}/su
+%verify_permissions -e %{_bindir}/wall -e %{_bindir}/write -e %{_bindir}/mount -e %{_bindir}/umount
+%verify_permissions -e %{_bindir}/su
 
 %endif
 
@@ -630,14 +615,14 @@ done
 
 %post
 %if "%ulsubset" == "core"
-%set_permissions %{ulbindir}/wall %{ulbindir}/write %{ulbindir}/mount %{ulbindir}/umount
-%set_permissions %{ulbindir}/su
+%set_permissions %{_bindir}/wall %{_bindir}/write %{_bindir}/mount %{_bindir}/umount
+%set_permissions %{_bindir}/su
 %if ! %{defined no_config}
 #
 # If outdated PAM file is detected, issue a warning.
 for PAM_FILE in login remote runuser runuser-l su su-l ; do
-	if test -f %{ulpamdir}/$PAM_FILE.rpmnew ; then
-		echo "Your %{ulpamdir}/$PAM_FILE is outdated. Please check %{ulpamdir}/$PAM_FILE.rpmnew!" >&2
+	if test -f %{_pam_vendordir}/$PAM_FILE.rpmnew ; then
+		echo "Your %{_pam_vendordir}/$PAM_FILE is outdated. Please check %{_pam_vendordir}/$PAM_FILE.rpmnew!" >&2
 	fi
 done
 #
@@ -646,15 +631,15 @@ done
 # Perform one-time config replace.
 # Applies for: Update from SLE11, online update for SLE15 SP1, Leap15.1.
 # Not needed for /etc/default/runuser. It was first packaged after the change.
-if ! grep -q "^# /etc/default/su is an override" %{ulsysconfdir}/default/su ; then
-	if test -f %{ulsysconfdir}/default/su.rpmnew ; then
-		if ! test -f %{ulsysconfdir}/default/su.rpmorig ; then
-			cp -a %{ulsysconfdir}/default/su %{ulsysconfdir}/default/su.rpmorig
+if ! grep -q "^# /etc/default/su is an override" %{_sysconfdir}/default/su ; then
+	if test -f %{_sysconfdir}/default/su.rpmnew ; then
+		if ! test -f %{_sysconfdir}/default/su.rpmorig ; then
+			cp -a %{_sysconfdir}/default/su %{_sysconfdir}/default/su.rpmorig
 		fi
-		mv %{ulsysconfdir}/default/su.rpmnew %{ulsysconfdir}/default/su
-		echo "One time clean-up of %{ulsysconfdir}/default/su was performed." >&2
-		echo "Original contents was saved to %{ulsysconfdir}/default/su.rpmorig." >&2
-		echo "Please edit %{ulsysconfdir}/login.defs or %{ulsysconfdir}/default/su to restore your customization." >&2
+		mv %{_sysconfdir}/default/su.rpmnew %{_sysconfdir}/default/su
+		echo "One time clean-up of %{_sysconfdir}/default/su was performed." >&2
+		echo "Original contents was saved to %{_sysconfdir}/default/su.rpmorig." >&2
+		echo "Please edit %{_sysconfdir}/login.defs or %{_sysconfdir}/default/su to restore your customization." >&2
 	fi
 fi
 %endif
@@ -739,32 +724,32 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
 %license Documentation/licenses/*
 %attr(-,uuidd,uuidd) %dir %{_sharedstatedir}/libuuid
 %attr(-,uuidd,uuidd) %ghost %{_sharedstatedir}/libuuid/clock.txt
-%config(noreplace) %{ulsysconfdir}/filesystems
-%config(noreplace) %{ulsysconfdir}/blkid.conf
+%config(noreplace) %{_sysconfdir}/filesystems
+%config(noreplace) %{_sysconfdir}/blkid.conf
 %endif
 %if %{defined no_config}
-%{ulpamdir}/login
-%{ulpamdir}/remote
-%{ulpamdir}/runuser
-%{ulpamdir}/runuser-l
-%{ulpamdir}/su
-%{ulpamdir}/su-l
+%{_pam_vendordir}/login
+%{_pam_vendordir}/remote
+%{_pam_vendordir}/runuser
+%{_pam_vendordir}/runuser-l
+%{_pam_vendordir}/su
+%{_pam_vendordir}/su-l
 %if 0%{?suse_version} <= 1520
-%dir %{uldistconfdir}/default
+%dir %{_distconfdir}/default
 %endif
-%{uldistconfdir}/default/runuser
-%{uldistconfdir}/default/su
+%{_distconfdir}/default/runuser
+%{_distconfdir}/default/su
 %else
-%config(noreplace) %{ulpamdir}/login
-%config(noreplace) %{ulpamdir}/remote
-%config(noreplace) %{ulpamdir}/runuser
-%config(noreplace) %{ulpamdir}/runuser-l
-%config(noreplace) %{ulpamdir}/su
-%config(noreplace) %{ulpamdir}/su-l
-%config(noreplace) %{ulsysconfdir}/default/runuser
-%config(noreplace) %{ulsysconfdir}/default/su
+%config(noreplace) %{_pam_vendordir}/login
+%config(noreplace) %{_pam_vendordir}/remote
+%config(noreplace) %{_pam_vendordir}/runuser
+%config(noreplace) %{_pam_vendordir}/runuser-l
+%config(noreplace) %{_pam_vendordir}/su
+%config(noreplace) %{_pam_vendordir}/su-l
+%config(noreplace) %{_sysconfdir}/default/runuser
+%config(noreplace) %{_sysconfdir}/default/su
 %endif
-%config %dir %{ulsysconfdir}/issue.d
+%config %dir %{_sysconfdir}/issue.d
 %if %{ul_extra_bin_sbin}
 %exclude /bin/findmnt
 /bin/kill
@@ -801,128 +786,129 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
 /sbin/fstrim
 /sbin/chcpu
 %endif
-%{ulbindir}/kill
-%verify(not mode) %attr(%ul_suid,root,root) %{ulbindir}/su
-%{ulbindir}/eject
-%{ulbindir}/cal
-%{ulbindir}/chmem
-%{ulbindir}/choom
-%{ulbindir}/chrt
-%{ulbindir}/col
-%{ulbindir}/colcrt
-%{ulbindir}/colrm
-%{ulbindir}/column
-%{ulbindir}/dmesg
-%{ulbindir}/fallocate
-%{ulbindir}/fincore
+%{_bindir}/kill
+%verify(not mode) %attr(%ul_suid,root,root) %{_bindir}/su
+%{_bindir}/eject
+%{_bindir}/cal
+%{_bindir}/chmem
+%{_bindir}/choom
+%{_bindir}/chrt
+%{_bindir}/col
+%{_bindir}/colcrt
+%{_bindir}/colrm
+%{_bindir}/column
+%{_bindir}/dmesg
+%{_bindir}/fallocate
+%{_bindir}/fincore
 %if "%ulsubset" == "core"
-%exclude %{ulbindir}/findmnt
-%exclude %{ulbindir}/logger
-%exclude %{ulbindir}/lsblk
-%exclude %{ulbindir}/lslogins
+%exclude %{_bindir}/findmnt
+%exclude %{_bindir}/logger
+%exclude %{_bindir}/lsblk
+%exclude %{_bindir}/lslogins
+%exclude %{_mandir}/man*/*
 %endif
-%{ulbindir}/flock
-%{ulbindir}/getopt
-%{ulbindir}/hardlink
-%{ulbindir}/hexdump
-%{ulbindir}/ionice
-%{ulbindir}/ipcmk
-%{ulbindir}/ipcrm
-%{ulbindir}/ipcs
-%{ulbindir}/irqtop
-%{ulbindir}/isosize
-%{ulbindir}/last
-%{ulbindir}/lastb
-%{ulbindir}/line
-%{ulbindir}/look
+%{_bindir}/flock
+%{_bindir}/getopt
+%{_bindir}/hardlink
+%{_bindir}/hexdump
+%{_bindir}/ionice
+%{_bindir}/ipcmk
+%{_bindir}/ipcrm
+%{_bindir}/ipcs
+%{_bindir}/irqtop
+%{_bindir}/isosize
+%{_bindir}/last
+%{_bindir}/lastb
+%{_bindir}/line
+%{_bindir}/look
 %if !%{ul_extra_bin_sbin}
-%{ulbindir}/login
+%{_bindir}/login
 %endif
-%{ulbindir}/lscpu
-%{ulbindir}/lsfd
-%{ulbindir}/lsipc
-%{ulbindir}/lsirq
-%{ulbindir}/lslocks
-%{ulbindir}/lsmem
-%{ulbindir}/lsns
-%{ulbindir}/mcookie
-%{ulbindir}/mesg
-%{ulbindir}/more
-%verify(not mode) %attr(%ul_suid,root,root) %{ulbindir}/mount
-%{ulbindir}/namei
-%{ulbindir}/nsenter
-%{ulbindir}/prlimit
-%{ulbindir}/rename
-%{ulbindir}/renice
-%{ulbindir}/rev
-%{ulbindir}/script
-%{ulbindir}/scriptlive
-%{ulbindir}/scriptreplay
-%{ulbindir}/setarch
-%{ulbindir}/setpriv
-%{ulbindir}/setsid
-%{ulbindir}/taskset
-%{ulbindir}/uclampset
-%{ulbindir}/ul
-%verify(not mode)%attr(%ul_suid,root,root)  %{ulbindir}/umount
-%{ulbindir}/unshare
-%{ulbindir}/mountpoint
-%{ulbindir}/utmpdump
-%{ulbindir}/uuidgen
-%{ulbindir}/uuidparse
-%{ulbindir}/uname26
-%{ulbindir}/wdctl
-%{ulsbindir}/addpart
-%{ulsbindir}/agetty
-%{ulsbindir}/blkid
-%{ulsbindir}/blkdiscard
+%{_bindir}/lscpu
+%{_bindir}/lsfd
+%{_bindir}/lsipc
+%{_bindir}/lsirq
+%{_bindir}/lslocks
+%{_bindir}/lsmem
+%{_bindir}/lsns
+%{_bindir}/mcookie
+%{_bindir}/mesg
+%{_bindir}/more
+%verify(not mode) %attr(%ul_suid,root,root) %{_bindir}/mount
+%{_bindir}/namei
+%{_bindir}/nsenter
+%{_bindir}/prlimit
+%{_bindir}/rename
+%{_bindir}/renice
+%{_bindir}/rev
+%{_bindir}/script
+%{_bindir}/scriptlive
+%{_bindir}/scriptreplay
+%{_bindir}/setarch
+%{_bindir}/setpriv
+%{_bindir}/setsid
+%{_bindir}/taskset
+%{_bindir}/uclampset
+%{_bindir}/ul
+%verify(not mode)%attr(%ul_suid,root,root)  %{_bindir}/umount
+%{_bindir}/unshare
+%{_bindir}/mountpoint
+%{_bindir}/utmpdump
+%{_bindir}/uuidgen
+%{_bindir}/uuidparse
+%{_bindir}/uname26
+%{_bindir}/wdctl
+%{_sbindir}/addpart
+%{_sbindir}/agetty
+%{_sbindir}/blkid
+%{_sbindir}/blkdiscard
 # blkzone depends on linux/blkzoned.h
 %if 0%{?suse_version} >= 1330
-%{ulsbindir}/blkzone
+%{_sbindir}/blkzone
 %endif
-%{ulsbindir}/blockdev
-%{ulsbindir}/chcpu
-%{ulsbindir}/ctrlaltdel
-%{ulsbindir}/delpart
-%{ulsbindir}/findfs
-%{ulsbindir}/fsck
-%{ulsbindir}/fsck.minix
-%{ulsbindir}/fsck.cramfs
-%{ulsbindir}/fsfreeze
-%{ulsbindir}/fstrim
-%{ulsbindir}/ldattach
-%{ulsbindir}/losetup
-%{ulsbindir}/mkfs
-%{ulsbindir}/mkfs.bfs
-%{ulsbindir}/mkfs.minix
-%{ulsbindir}/mkfs.cramfs
-%{ulsbindir}/mkswap
-%{ulsbindir}/nologin
-%{ulsbindir}/partx
-%{ulsbindir}/pivot_root
-%{ulsbindir}/resizepart
-%{ulsbindir}/rfkill
-%{ulsbindir}/rtcwake
-%{ulsbindir}/runuser
-%{ulsbindir}/sulogin
-%{ulsbindir}/swaplabel
-%{ulsbindir}/swapoff
-%{ulsbindir}/swapon
-%{ulsbindir}/switch_root
-%{ulsbindir}/wipefs
-%verify(not mode) %attr(0755,root,tty) %{ulbindir}/wall
-%{ulbindir}/whereis
-%verify(not mode) %attr(0755,root,tty) %{ulbindir}/write
-%{ulsbindir}/zramctl
-%{ulsbindir}/flushb
-%{ulsbindir}/readprofile
+%{_sbindir}/blockdev
+%{_sbindir}/chcpu
+%{_sbindir}/ctrlaltdel
+%{_sbindir}/delpart
+%{_sbindir}/findfs
+%{_sbindir}/fsck
+%{_sbindir}/fsck.minix
+%{_sbindir}/fsck.cramfs
+%{_sbindir}/fsfreeze
+%{_sbindir}/fstrim
+%{_sbindir}/ldattach
+%{_sbindir}/losetup
+%{_sbindir}/mkfs
+%{_sbindir}/mkfs.bfs
+%{_sbindir}/mkfs.minix
+%{_sbindir}/mkfs.cramfs
+%{_sbindir}/mkswap
+%{_sbindir}/nologin
+%{_sbindir}/partx
+%{_sbindir}/pivot_root
+%{_sbindir}/resizepart
+%{_sbindir}/rfkill
+%{_sbindir}/rtcwake
+%{_sbindir}/runuser
+%{_sbindir}/sulogin
+%{_sbindir}/swaplabel
+%{_sbindir}/swapoff
+%{_sbindir}/swapon
+%{_sbindir}/switch_root
+%{_sbindir}/wipefs
+%verify(not mode) %attr(0755,root,tty) %{_bindir}/wall
+%{_bindir}/whereis
+%verify(not mode) %attr(0755,root,tty) %{_bindir}/write
+%{_sbindir}/zramctl
+%{_sbindir}/flushb
+%{_sbindir}/readprofile
 # These directories should be owned by bash-completion. But we don't want to
 # install them on build, so own these two directories:
-%dir %{uldatadir}/bash-completion
-%dir %{uldatadir}/bash-completion/completions
-%{uldatadir}/bash-completion/completions/*
+%dir %{_datadir}/bash-completion
+%dir %{_datadir}/bash-completion/completions
+%{_datadir}/bash-completion/completions/*
 #
-%exclude %{uldatadir}/bash-completion/completions/uuidd
+%exclude %{_datadir}/bash-completion/completions/uuidd
 # util-linux documentation files
 %doc Documentation/blkid.txt
 %doc Documentation/cal.txt
@@ -934,38 +920,37 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
 %doc Documentation/modems-with-agetty.txt
 %doc Documentation/mount.txt
 %doc Documentation/pg.txt
-%{uldocdir}/%{name}/getopt-example.*
-%exclude %{ulmandir}/man*/*
-%exclude %{ulsbindir}/uuidd
+%{_docdir}/%{name}/getopt-example.*
+%exclude %{_sbindir}/uuidd
 %endif
 %if "%ulsubset" == "systemd"
 %exclude %attr(-,uuidd,uuidd) %dir %{_sharedstatedir}/libuuid
 %exclude %attr(-,uuidd,uuidd) %ghost %{_sharedstatedir}/libuuid/clock.txt
-%exclude %config(noreplace) %{ulsysconfdir}/filesystems
-%exclude %config(noreplace) %{ulsysconfdir}/blkid.conf
+%exclude %config(noreplace) %{_sysconfdir}/filesystems
+%exclude %config(noreplace) %{_sysconfdir}/blkid.conf
 %if %{defined no_config}
-%exclude %{ulpamdir}/login
-%exclude %{ulpamdir}/remote
-%exclude %{ulpamdir}/runuser
-%exclude %{ulpamdir}/runuser-l
-%exclude %{ulpamdir}/su
-%exclude %{ulpamdir}/su-l
+%exclude %{_pam_vendordir}/login
+%exclude %{_pam_vendordir}/remote
+%exclude %{_pam_vendordir}/runuser
+%exclude %{_pam_vendordir}/runuser-l
+%exclude %{_pam_vendordir}/su
+%exclude %{_pam_vendordir}/su-l
 %if 0%{?suse_version} <= 1520
-%exclude %dir %{uldistconfdir}/default
+%exclude %dir %{_distconfdir}/default
 %endif
-%exclude %{uldistconfdir}/default/runuser
-%exclude %{uldistconfdir}/default/su
+%exclude %{_distconfdir}/default/runuser
+%exclude %{_distconfdir}/default/su
 %else
-%exclude %config(noreplace) %{ulpamdir}/login
-%exclude %config(noreplace) %{ulpamdir}/remote
-%exclude %config(noreplace) %{ulpamdir}/runuser
-%exclude %config(noreplace) %{ulpamdir}/runuser-l
-%exclude %config(noreplace) %{ulpamdir}/su
-%exclude %config(noreplace) %{ulpamdir}/su-l
-%exclude %config(noreplace) %{ulsysconfdir}/default/runuser
-%exclude %config(noreplace) %{ulsysconfdir}/default/su
+%exclude %config(noreplace) %{_pam_vendordir}/login
+%exclude %config(noreplace) %{_pam_vendordir}/remote
+%exclude %config(noreplace) %{_pam_vendordir}/runuser
+%exclude %config(noreplace) %{_pam_vendordir}/runuser-l
+%exclude %config(noreplace) %{_pam_vendordir}/su
+%exclude %config(noreplace) %{_pam_vendordir}/su-l
+%exclude %config(noreplace) %{_sysconfdir}/default/runuser
+%exclude %config(noreplace) %{_sysconfdir}/default/su
 %endif
-%exclude %config %dir %{ulsysconfdir}/issue.d
+%exclude %config %dir %{_sysconfdir}/issue.d
 %if %{ul_extra_bin_sbin}
 %exclude /bin/findmnt
 %exclude /bin/kill
@@ -1002,246 +987,250 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
 %exclude /sbin/fstrim
 %exclude /sbin/chcpu
 %endif
-%exclude %{ulbindir}/kill
-%exclude %verify(not mode) %attr(%ul_suid,root,root) %{ulbindir}/su
-%exclude %{ulbindir}/eject
-%exclude %{ulbindir}/cal
-%exclude %{ulbindir}/chmem
-%exclude %{ulbindir}/choom
-%exclude %{ulbindir}/chrt
-%exclude %{ulbindir}/col
-%exclude %{ulbindir}/colcrt
-%exclude %{ulbindir}/colrm
-%exclude %{ulbindir}/column
-%exclude %{ulbindir}/dmesg
-%exclude %{ulbindir}/fallocate
-%exclude %{ulbindir}/fincore
-%{ulbindir}/findmnt
-%exclude %{ulbindir}/flock
-%exclude %{ulbindir}/getopt
-%exclude %{ulbindir}/hardlink
-%exclude %{ulbindir}/hexdump
-%exclude %{ulbindir}/ionice
-%exclude %{ulbindir}/ipcmk
-%exclude %{ulbindir}/ipcrm
-%exclude %{ulbindir}/ipcs
-%exclude %{ulbindir}/irqtop
-%exclude %{ulbindir}/isosize
-%exclude %{ulbindir}/last
-%exclude %{ulbindir}/lastb
-%exclude %{ulbindir}/line
-%{ulbindir}/logger
-%exclude %{ulbindir}/look
+%exclude %{_bindir}/kill
+%exclude %verify(not mode) %attr(%ul_suid,root,root) %{_bindir}/su
+%exclude %{_bindir}/eject
+%exclude %{_bindir}/cal
+%exclude %{_bindir}/chmem
+%exclude %{_bindir}/choom
+%exclude %{_bindir}/chrt
+%exclude %{_bindir}/col
+%exclude %{_bindir}/colcrt
+%exclude %{_bindir}/colrm
+%exclude %{_bindir}/column
+%exclude %{_bindir}/dmesg
+%exclude %{_bindir}/fallocate
+%exclude %{_bindir}/fincore
+%{_bindir}/findmnt
+%exclude %{_bindir}/flock
+%exclude %{_bindir}/getopt
+%exclude %{_bindir}/hardlink
+%exclude %{_bindir}/hexdump
+%exclude %{_bindir}/ionice
+%exclude %{_bindir}/ipcmk
+%exclude %{_bindir}/ipcrm
+%exclude %{_bindir}/ipcs
+%exclude %{_bindir}/irqtop
+%exclude %{_bindir}/isosize
+%exclude %{_bindir}/last
+%exclude %{_bindir}/lastb
+%exclude %{_bindir}/line
+%{_bindir}/logger
+%exclude %{_bindir}/look
 %if !%{ul_extra_bin_sbin}
-%exclude %{ulbindir}/login
+%exclude %{_bindir}/login
 %endif
-%{ulbindir}/lsblk
-%exclude %{ulbindir}/lscpu
-%exclude %{ulbindir}/lsfd
-%exclude %{ulbindir}/lsipc
-%exclude %{ulbindir}/lsirq
-%{ulbindir}/lslocks
-%{ulbindir}/lslogins
-%exclude %{ulbindir}/lsmem
-%exclude %{ulbindir}/lsns
-%exclude %{ulbindir}/mcookie
-%exclude %{ulbindir}/mesg
-%exclude %{ulbindir}/more
-%exclude %verify(not mode) %attr(%ul_suid,root,root) %{ulbindir}/mount
-%exclude %{ulbindir}/namei
-%exclude %{ulbindir}/nsenter
-%exclude %{ulbindir}/prlimit
-%exclude %{ulbindir}/rename
-%exclude %{ulbindir}/renice
-%exclude %{ulbindir}/rev
-%exclude %{ulbindir}/script
-%exclude %{ulbindir}/scriptlive
-%exclude %{ulbindir}/scriptreplay
-%exclude %{ulbindir}/setarch
-%exclude %{ulbindir}/setpriv
-%exclude %{ulbindir}/setsid
-%exclude %{ulbindir}/taskset
-%exclude %{ulbindir}/uclampset
-%exclude %{ulbindir}/ul
-%exclude %verify(not mode)%attr(%ul_suid,root,root)  %{ulbindir}/umount
-%exclude %{ulbindir}/unshare
-%exclude %{ulbindir}/mountpoint
-%exclude %{ulbindir}/utmpdump
-%exclude %{ulbindir}/uuidgen
-%exclude %{ulbindir}/uuidparse
-%exclude %{ulbindir}/uname26
-%exclude %{ulbindir}/wdctl
-%exclude %{ulsbindir}/addpart
-%exclude %{ulsbindir}/agetty
-%exclude %{ulsbindir}/blkid
-%exclude %{ulsbindir}/blkdiscard
+%{_bindir}/lsblk
+%exclude %{_bindir}/lscpu
+%exclude %{_bindir}/lsfd
+%exclude %{_bindir}/lsipc
+%exclude %{_bindir}/lsirq
+%{_bindir}/lslocks
+%{_bindir}/lslogins
+%exclude %{_bindir}/lsmem
+%exclude %{_bindir}/lsns
+%exclude %{_bindir}/mcookie
+%exclude %{_bindir}/mesg
+%exclude %{_bindir}/more
+%exclude %verify(not mode) %attr(%ul_suid,root,root) %{_bindir}/mount
+%exclude %{_bindir}/namei
+%exclude %{_bindir}/nsenter
+%exclude %{_bindir}/prlimit
+%exclude %{_bindir}/rename
+%exclude %{_bindir}/renice
+%exclude %{_bindir}/rev
+%exclude %{_bindir}/script
+%exclude %{_bindir}/scriptlive
+%exclude %{_bindir}/scriptreplay
+%exclude %{_bindir}/setarch
+%exclude %{_bindir}/setpriv
+%exclude %{_bindir}/setsid
+%exclude %{_bindir}/taskset
+%exclude %{_bindir}/uclampset
+%exclude %{_bindir}/ul
+%exclude %verify(not mode)%attr(%ul_suid,root,root)  %{_bindir}/umount
+%exclude %{_bindir}/unshare
+%exclude %{_bindir}/mountpoint
+%exclude %{_bindir}/utmpdump
+%exclude %{_bindir}/uuidgen
+%exclude %{_bindir}/uuidparse
+%exclude %{_bindir}/uname26
+%exclude %{_bindir}/wdctl
+%exclude %{_sbindir}/addpart
+%exclude %{_sbindir}/agetty
+%exclude %{_sbindir}/blkid
+%exclude %{_sbindir}/blkdiscard
 # blkzone depends on linux/blkzoned.h
 %if 0%{?suse_version} >= 1330
-%exclude %{ulsbindir}/blkzone
+%exclude %{_sbindir}/blkzone
 %endif
-%exclude %{ulsbindir}/blockdev
-%exclude %{ulsbindir}/chcpu
-%exclude %{ulsbindir}/ctrlaltdel
-%exclude %{ulsbindir}/delpart
-%exclude %{ulsbindir}/findfs
-%exclude %{ulsbindir}/fsck
-%exclude %{ulsbindir}/fsck.minix
-%exclude %{ulsbindir}/fsck.cramfs
-%exclude %{ulsbindir}/fsfreeze
-%exclude %{ulsbindir}/fstrim
-%exclude %{ulsbindir}/ldattach
-%exclude %{ulsbindir}/losetup
-%exclude %{ulsbindir}/mkfs
-%exclude %{ulsbindir}/mkfs.bfs
-%exclude %{ulsbindir}/mkfs.minix
-%exclude %{ulsbindir}/mkfs.cramfs
-%exclude %{ulsbindir}/mkswap
-%exclude %{ulsbindir}/nologin
-%exclude %{ulsbindir}/partx
-%exclude %{ulsbindir}/pivot_root
-%exclude %{ulsbindir}/resizepart
-%exclude %{ulsbindir}/rfkill
-%exclude %{ulsbindir}/rtcwake
-%exclude %{ulsbindir}/runuser
-%exclude %{ulsbindir}/sulogin
-%exclude %{ulsbindir}/swaplabel
-%exclude %{ulsbindir}/swapoff
-%exclude %{ulsbindir}/swapon
-%exclude %{ulsbindir}/switch_root
-%exclude %{ulsbindir}/wipefs
-%verify(not mode) %attr(0755,root,tty) %{ulbindir}/wall
-%exclude %{ulbindir}/whereis
-%verify(not mode) %attr(0755,root,tty) %{ulbindir}/write
-%exclude %{ulsbindir}/zramctl
-%exclude %{ulsbindir}/flushb
-%exclude %{ulsbindir}/readprofile
+%exclude %{_sbindir}/blockdev
+%exclude %{_sbindir}/chcpu
+%exclude %{_sbindir}/ctrlaltdel
+%exclude %{_sbindir}/delpart
+%exclude %{_sbindir}/findfs
+%exclude %{_sbindir}/fsck
+%exclude %{_sbindir}/fsck.minix
+%exclude %{_sbindir}/fsck.cramfs
+%exclude %{_sbindir}/fsfreeze
+%exclude %{_sbindir}/fstrim
+%exclude %{_sbindir}/ldattach
+%exclude %{_sbindir}/losetup
+%exclude %{_sbindir}/mkfs
+%exclude %{_sbindir}/mkfs.bfs
+%exclude %{_sbindir}/mkfs.minix
+%exclude %{_sbindir}/mkfs.cramfs
+%exclude %{_sbindir}/mkswap
+%exclude %{_sbindir}/nologin
+%exclude %{_sbindir}/partx
+%exclude %{_sbindir}/pivot_root
+%exclude %{_sbindir}/resizepart
+%exclude %{_sbindir}/rfkill
+%exclude %{_sbindir}/rtcwake
+%exclude %{_sbindir}/runuser
+%exclude %{_sbindir}/sulogin
+%exclude %{_sbindir}/swaplabel
+%exclude %{_sbindir}/swapoff
+%exclude %{_sbindir}/swapon
+%exclude %{_sbindir}/switch_root
+%exclude %{_sbindir}/wipefs
+%verify(not mode) %attr(0755,root,tty) %{_bindir}/wall
+%exclude %{_bindir}/whereis
+%verify(not mode) %attr(0755,root,tty) %{_bindir}/write
+%exclude %{_sbindir}/zramctl
+%exclude %{_sbindir}/flushb
+%exclude %{_sbindir}/readprofile
 # These directories should be owned by bash-completion. But we don't want to
 # install them on build, so own these two directories:
-%exclude %dir %{uldatadir}/bash-completion
-%exclude %dir %{uldatadir}/bash-completion/completions
-%exclude %{uldatadir}/bash-completion/completions/*
+%exclude %dir %{_datadir}/bash-completion
+%exclude %dir %{_datadir}/bash-completion/completions
+%exclude %{_datadir}/bash-completion/completions/*
 #
-%exclude %{ulsbindir}/uuidd
-%exclude %{uldatadir}/bash-completion/completions/uuidd
-%exclude %{uldatadir}/locale
-%exclude %{ulincludedir}/*
-%exclude %{ullibdir}/lib*.*
-%exclude %{ullibdir}/pkgconfig/*.pc
-%exclude %{uldocdir}/%{name}/getopt-example.*
-%{ulmandir}/man1/kill.1.gz
-%{ulmandir}/man1/su.1.gz
-%{ulmandir}/man1/cal.1.gz
-%{ulmandir}/man1/choom.1.gz
-%{ulmandir}/man1/chrt.1.gz
-%{ulmandir}/man1/col.1.gz
-%{ulmandir}/man1/colcrt.1.gz
-%{ulmandir}/man1/colrm.1.gz
-%{ulmandir}/man1/column.1.gz
-%{ulmandir}/man1/dmesg.1.gz
-%{ulmandir}/man1/eject.1.gz
-%{ulmandir}/man1/fallocate.1.gz
-%{ulmandir}/man1/fincore.1.gz
-%{ulmandir}/man1/flock.1.gz
-%{ulmandir}/man1/getopt.1.gz
-%{ulmandir}/man1/hardlink.1.gz
-%{ulmandir}/man1/hexdump.1.gz
-%{ulmandir}/man1/ipcrm.1.gz
-%{ulmandir}/man1/ipcs.1.gz
-%{ulmandir}/man1/last.1.gz
-%{ulmandir}/man1/lastb.1.gz
-%{ulmandir}/man1/line.1.gz
-%{ulmandir}/man1/login.1.gz
-%{ulmandir}/man1/look.1.gz
-%{ulmandir}/man1/logger.1.gz
-%{ulmandir}/man1/lscpu.1.gz
-%{ulmandir}/man1/lsfd.1.gz
-%{ulmandir}/man1/lsipc.1.gz
-%{ulmandir}/man1/lsirq.1.gz
-%{ulmandir}/man1/lslogins.1.gz
-%{ulmandir}/man8/lsblk.8.gz
-%{ulmandir}/man1/lsmem.1.gz
-%{ulmandir}/man1/mcookie.1.gz
-%{ulmandir}/man1/mesg.1.gz
-%{ulmandir}/man1/more.1.gz
-%{ulmandir}/man1/namei.1.gz
-%{ulmandir}/man1/nsenter.1.gz
-%{ulmandir}/man1/ionice.1.gz
-%{ulmandir}/man1/irqtop.1.gz
-%{ulmandir}/man1/prlimit.1.gz
-%{ulmandir}/man1/rename.1.gz
-%{ulmandir}/man1/rev.1.gz
-%{ulmandir}/man1/renice.1.gz
-%{ulmandir}/man1/setpriv.1.gz
-%{ulmandir}/man1/setsid.1.gz
-%{ulmandir}/man1/script.1.gz
-%{ulmandir}/man1/scriptlive.1.gz
-%{ulmandir}/man1/scriptreplay.1.gz
-%{ulmandir}/man1/setterm.1.gz
-%{ulmandir}/man1/taskset.1.gz
-%{ulmandir}/man1/ul.1.gz
-%{ulmandir}/man1/unshare.1.gz
-%{ulmandir}/man1/wall.1.gz
-%{ulmandir}/man1/whereis.1.gz
-%{ulmandir}/man1/write.1.gz
-%{ulmandir}/man1/ipcmk.1.gz
-%{ulmandir}/man1/mountpoint.1.gz
-%{ulmandir}/man1/runuser.1.gz
-%{ulmandir}/man1/uclampset.1.gz
-%{ulmandir}/man1/utmpdump.1.gz
-%{ulmandir}/man1/uuidgen.1.gz
-%{ulmandir}/man1/uuidparse.1.gz
-%{ulmandir}/man5/adjtime_config.5.gz
-%{ulmandir}/man5/fstab.5.gz
-%{ulmandir}/man5/terminal-colors.d.5.gz
-%{ulmandir}/man8/addpart.8.gz
-%{ulmandir}/man8/agetty.8.gz
+%exclude %{_sbindir}/uuidd
+%exclude %{_datadir}/bash-completion/completions/uuidd
+%exclude %{_datadir}/locale
+%exclude %{_includedir}/*
+%exclude %{_libdir}/lib*.*
+%exclude %{_libdir}/pkgconfig/*.pc
+%exclude %{_docdir}/%{name}/getopt-example.*
+# packaged in core step
+%exclude %{_mandir}/man3/libblkid.3.gz
+%exclude %{_mandir}/man3/uuid.3.gz
+%exclude %{_mandir}/man3/uuid_*.3.gz
+%{_mandir}/man1/kill.1.gz
+%{_mandir}/man1/su.1.gz
+%{_mandir}/man1/cal.1.gz
+%{_mandir}/man1/choom.1.gz
+%{_mandir}/man1/chrt.1.gz
+%{_mandir}/man1/col.1.gz
+%{_mandir}/man1/colcrt.1.gz
+%{_mandir}/man1/colrm.1.gz
+%{_mandir}/man1/column.1.gz
+%{_mandir}/man1/dmesg.1.gz
+%{_mandir}/man1/eject.1.gz
+%{_mandir}/man1/fallocate.1.gz
+%{_mandir}/man1/fincore.1.gz
+%{_mandir}/man1/flock.1.gz
+%{_mandir}/man1/getopt.1.gz
+%{_mandir}/man1/hardlink.1.gz
+%{_mandir}/man1/hexdump.1.gz
+%{_mandir}/man1/ipcrm.1.gz
+%{_mandir}/man1/ipcs.1.gz
+%{_mandir}/man1/last.1.gz
+%{_mandir}/man1/lastb.1.gz
+%{_mandir}/man1/line.1.gz
+%{_mandir}/man1/login.1.gz
+%{_mandir}/man1/look.1.gz
+%{_mandir}/man1/logger.1.gz
+%{_mandir}/man1/lscpu.1.gz
+%{_mandir}/man1/lsfd.1.gz
+%{_mandir}/man1/lsipc.1.gz
+%{_mandir}/man1/lsirq.1.gz
+%{_mandir}/man1/lslogins.1.gz
+%{_mandir}/man8/lsblk.8.gz
+%{_mandir}/man1/lsmem.1.gz
+%{_mandir}/man1/mcookie.1.gz
+%{_mandir}/man1/mesg.1.gz
+%{_mandir}/man1/more.1.gz
+%{_mandir}/man1/namei.1.gz
+%{_mandir}/man1/nsenter.1.gz
+%{_mandir}/man1/ionice.1.gz
+%{_mandir}/man1/irqtop.1.gz
+%{_mandir}/man1/prlimit.1.gz
+%{_mandir}/man1/rename.1.gz
+%{_mandir}/man1/rev.1.gz
+%{_mandir}/man1/renice.1.gz
+%{_mandir}/man1/setpriv.1.gz
+%{_mandir}/man1/setsid.1.gz
+%{_mandir}/man1/script.1.gz
+%{_mandir}/man1/scriptlive.1.gz
+%{_mandir}/man1/scriptreplay.1.gz
+%{_mandir}/man1/setterm.1.gz
+%{_mandir}/man1/taskset.1.gz
+%{_mandir}/man1/ul.1.gz
+%{_mandir}/man1/unshare.1.gz
+%{_mandir}/man1/wall.1.gz
+%{_mandir}/man1/whereis.1.gz
+%{_mandir}/man1/write.1.gz
+%{_mandir}/man1/ipcmk.1.gz
+%{_mandir}/man1/mountpoint.1.gz
+%{_mandir}/man1/runuser.1.gz
+%{_mandir}/man1/uclampset.1.gz
+%{_mandir}/man1/utmpdump.1.gz
+%{_mandir}/man1/uuidgen.1.gz
+%{_mandir}/man1/uuidparse.1.gz
+%{_mandir}/man5/adjtime_config.5.gz
+%{_mandir}/man5/fstab.5.gz
+%{_mandir}/man5/terminal-colors.d.5.gz
+%{_mandir}/man8/addpart.8.gz
+%{_mandir}/man8/agetty.8.gz
 %if 0%{?suse_version} >= 1330
-%{ulmandir}/man8/blkzone.8.gz
+%{_mandir}/man8/blkzone.8.gz
 %endif
-%{ulmandir}/man8/blockdev.8.gz
-%{ulmandir}/man8/chmem.8.gz
-%{ulmandir}/man8/ctrlaltdel.8.gz
-%{ulmandir}/man8/delpart.8.gz
-%{ulmandir}/man8/blkid.8.gz
-%{ulmandir}/man8/blkdiscard.8.gz
-%{ulmandir}/man8/switch_root.8.gz
-%{ulmandir}/man8/mkfs.bfs.8.gz
-%{ulmandir}/man8/mkfs.minix.8.gz
-%{ulmandir}/man8/findfs.8.gz
-%{ulmandir}/man8/fsck.8.gz
-%{ulmandir}/man8/fsck.cramfs.8.gz
-%{ulmandir}/man8/fsck.minix.8.gz
-%{ulmandir}/man8/isosize.8.gz
-%{ulmandir}/man8/ldattach.8.gz
-%{ulmandir}/man8/losetup.8.gz
-%{ulmandir}/man8/lslocks.8.gz
-%{ulmandir}/man8/lsns.8.gz
-%{ulmandir}/man8/mkfs.8.gz
-%{ulmandir}/man8/mkfs.cramfs.8.gz
-%{ulmandir}/man8/mkswap.8.gz
-%{ulmandir}/man8/mount.8.gz
-%{ulmandir}/man8/nologin.8.gz
-%{ulmandir}/man8/fsfreeze.8.gz
-%{ulmandir}/man8/swaplabel.8.gz
-%{ulmandir}/man8/readprofile.8.gz
-%{ulmandir}/man8/rfkill.8.gz
-%{ulmandir}/man8/chcpu.8.gz
-%{ulmandir}/man8/partx.8.gz
-%{ulmandir}/man8/pivot_root.8.gz
-%{ulmandir}/man8/rtcwake.8.gz
-%{ulmandir}/man8/setarch.8.gz
-%{ulmandir}/man8/swapoff.8.gz
-%{ulmandir}/man8/swapon.8.gz
-%{ulmandir}/man8/umount.8.gz
-%{ulmandir}/man8/uname26.8.gz
-%{ulmandir}/man8/wipefs.8.gz
-%{ulmandir}/man8/zramctl.8.gz
-%{ulmandir}/man8/findmnt.8.gz
-%{ulmandir}/man8/fstrim.8.gz
-%{ulmandir}/man8/resizepart.8.gz
-%{ulmandir}/man8/sulogin.8.gz
-%{ulmandir}/man8/wdctl.8.gz
-%{ulsbindir}/rcfstrim
+%{_mandir}/man8/blockdev.8.gz
+%{_mandir}/man8/chmem.8.gz
+%{_mandir}/man8/ctrlaltdel.8.gz
+%{_mandir}/man8/delpart.8.gz
+%{_mandir}/man8/blkid.8.gz
+%{_mandir}/man8/blkdiscard.8.gz
+%{_mandir}/man8/switch_root.8.gz
+%{_mandir}/man8/mkfs.bfs.8.gz
+%{_mandir}/man8/mkfs.minix.8.gz
+%{_mandir}/man8/findfs.8.gz
+%{_mandir}/man8/fsck.8.gz
+%{_mandir}/man8/fsck.cramfs.8.gz
+%{_mandir}/man8/fsck.minix.8.gz
+%{_mandir}/man8/isosize.8.gz
+%{_mandir}/man8/ldattach.8.gz
+%{_mandir}/man8/losetup.8.gz
+%{_mandir}/man8/lslocks.8.gz
+%{_mandir}/man8/lsns.8.gz
+%{_mandir}/man8/mkfs.8.gz
+%{_mandir}/man8/mkfs.cramfs.8.gz
+%{_mandir}/man8/mkswap.8.gz
+%{_mandir}/man8/mount.8.gz
+%{_mandir}/man8/nologin.8.gz
+%{_mandir}/man8/fsfreeze.8.gz
+%{_mandir}/man8/swaplabel.8.gz
+%{_mandir}/man8/readprofile.8.gz
+%{_mandir}/man8/rfkill.8.gz
+%{_mandir}/man8/chcpu.8.gz
+%{_mandir}/man8/partx.8.gz
+%{_mandir}/man8/pivot_root.8.gz
+%{_mandir}/man8/rtcwake.8.gz
+%{_mandir}/man8/setarch.8.gz
+%{_mandir}/man8/swapoff.8.gz
+%{_mandir}/man8/swapon.8.gz
+%{_mandir}/man8/umount.8.gz
+%{_mandir}/man8/uname26.8.gz
+%{_mandir}/man8/wipefs.8.gz
+%{_mandir}/man8/zramctl.8.gz
+%{_mandir}/man8/findmnt.8.gz
+%{_mandir}/man8/fstrim.8.gz
+%{_mandir}/man8/resizepart.8.gz
+%{_mandir}/man8/sulogin.8.gz
+%{_mandir}/man8/wdctl.8.gz
+%{_sbindir}/rcfstrim
 %{_unitdir}/fstrim.service
 %{_unitdir}/fstrim.timer
 %endif
@@ -1251,57 +1240,52 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
 %if %{ul_extra_bin_sbin}
 /sbin/fdisk
 %endif
-%{ulsbindir}/fdisk
-%{ulmandir}/man8/fdisk.8.gz
+%{_sbindir}/fdisk
+%{_mandir}/man8/fdisk.8.gz
 %endif
 %ifnarch %sparc ia64 m68k
-%{ulmandir}/man8/cfdisk.8.gz
-%{ulmandir}/man8/sfdisk.8.gz
+%{_mandir}/man8/cfdisk.8.gz
+%{_mandir}/man8/sfdisk.8.gz
 %if %{ul_extra_bin_sbin}
 /sbin/cfdisk
 /sbin/sfdisk
 %endif
-%{ulsbindir}/cfdisk
-%{ulsbindir}/sfdisk
+%{_sbindir}/cfdisk
+%{_sbindir}/sfdisk
 %endif
 %ifnarch s390 s390x
-%{ulsbindir}/fdformat
+%{_sbindir}/fdformat
 %if %{ul_extra_bin_sbin}
 /sbin/hwclock
 %endif
-%{ulsbindir}/hwclock
-%{ulbindir}/setterm
-%{ulsbindir}/tunelp
-%{ulmandir}/man8/fdformat.8.gz
-%{ulmandir}/man8/hwclock.8.gz
-%{ulmandir}/man8/tunelp.8.gz
+%{_sbindir}/hwclock
+%{_bindir}/setterm
+%{_sbindir}/tunelp
+%{_mandir}/man8/fdformat.8.gz
+%{_mandir}/man8/hwclock.8.gz
+%{_mandir}/man8/tunelp.8.gz
 %endif
 
 %if "%ulsubset" == "core"
 %files -n libblkid1
-%defattr(-, root, root)
-%{ullibdir}/libblkid.so.1
-%{ullibdir}/libblkid.so.1.*
+%{_libdir}/libblkid.so.1
+%{_libdir}/libblkid.so.1.*
 
 %files -n libfdisk1
-%defattr(-, root, root)
-%{ullibdir}/libfdisk.so.1
-%{ullibdir}/libfdisk.so.1.*
+%{_libdir}/libfdisk.so.1
+%{_libdir}/libfdisk.so.1.*
 
 %files -n libmount1
-%defattr(-, root, root)
-%{ullibdir}/libmount.so.1
-%{ullibdir}/libmount.so.1.*
+%{_libdir}/libmount.so.1
+%{_libdir}/libmount.so.1.*
 
 %files -n libsmartcols1
-%defattr(-, root, root)
-%{ullibdir}/libsmartcols.so.1
-%{ullibdir}/libsmartcols.so.1.*
+%{_libdir}/libsmartcols.so.1
+%{_libdir}/libsmartcols.so.1.*
 
 %files -n libuuid1
-%defattr(-, root, root)
-%{ullibdir}/libuuid.so.1
-%{ullibdir}/libuuid.so.1.*
+%{_libdir}/libuuid.so.1
+%{_libdir}/libuuid.so.1.*
 
 #
 # devel, lang and uuidd files are not packaged in staging mode
@@ -1314,73 +1298,62 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
 %endif
 
 %files -n libblkid-devel
-%defattr(-, root, root)
-%{ullibdir}/libblkid.so
-%dir %{ulincludedir}/blkid
-%{ulincludedir}/blkid/blkid.h
-%{ullibdir}/pkgconfig/blkid.pc
-%{ulmandir}/man3/libblkid.3.gz
+%{_libdir}/libblkid.so
+%dir %{_includedir}/blkid
+%{_includedir}/blkid/blkid.h
+%{_libdir}/pkgconfig/blkid.pc
+%{_mandir}/man3/libblkid.3.gz
 
 %files -n libblkid-devel-static
-%defattr(-, root, root)
-%{ullibdir}/libblkid.*a
+%{_libdir}/libblkid.*a
 
 %files -n libfdisk-devel
-%defattr(-, root, root)
-%{ullibdir}/libfdisk.so
-%dir %{ulincludedir}/libfdisk
-%{ulincludedir}/libfdisk/libfdisk.h
-%{ullibdir}/pkgconfig/fdisk.pc
+%{_libdir}/libfdisk.so
+%dir %{_includedir}/libfdisk
+%{_includedir}/libfdisk/libfdisk.h
+%{_libdir}/pkgconfig/fdisk.pc
 
 %files -n libfdisk-devel-static
-%defattr(-, root, root)
-%{ullibdir}/libfdisk.*a
+%{_libdir}/libfdisk.*a
 
 %files -n libmount-devel
-%defattr(-, root, root)
-%{ullibdir}/libmount.so
-%dir %{ulincludedir}/libmount
-%{ulincludedir}/libmount/libmount.h
-%{ullibdir}/pkgconfig/mount.pc
+%{_libdir}/libmount.so
+%dir %{_includedir}/libmount
+%{_includedir}/libmount/libmount.h
+%{_libdir}/pkgconfig/mount.pc
 
 %files -n libmount-devel-static
-%defattr(-, root, root)
-%{ullibdir}/libmount.*a
+%{_libdir}/libmount.*a
 
 %files -n libsmartcols-devel
-%defattr(-, root, root)
-%{ullibdir}/libsmartcols.so
-%dir %{ulincludedir}/libsmartcols
-%{ulincludedir}/libsmartcols/libsmartcols.h
-%{ullibdir}/pkgconfig/smartcols.pc
+%{_libdir}/libsmartcols.so
+%dir %{_includedir}/libsmartcols
+%{_includedir}/libsmartcols/libsmartcols.h
+%{_libdir}/pkgconfig/smartcols.pc
 
 %files -n libsmartcols-devel-static
-%defattr(-, root, root)
-%{ullibdir}/libsmartcols.*a
+%{_libdir}/libsmartcols.*a
 
 %files -n libuuid-devel
-%defattr(-, root, root)
-%{ullibdir}/libuuid.so
-%dir %{ulincludedir}/uuid
-%{ulincludedir}/uuid/uuid.h
-%{ullibdir}/pkgconfig/uuid.pc
-%{ulmandir}/man3/uuid*
+%{_libdir}/libuuid.so
+%dir %{_includedir}/uuid
+%{_includedir}/uuid/uuid.h
+%{_libdir}/pkgconfig/uuid.pc
+%{_mandir}/man3/uuid*
 
 %files -n libuuid-devel-static
-%defattr(-, root, root)
-%{ullibdir}/libuuid.*a
+%{_libdir}/libuuid.*a
 %endif
 
 %if "%ulsubset" == "systemd"
 %files -n uuidd
-%defattr(-, root, root)
-%{ulsbindir}/uuidd
+%{_sbindir}/uuidd
 %attr(-,uuidd,uuidd) %dir %{_sharedstatedir}/libuuid
 %attr(-,uuidd,uuidd) %ghost %{_sharedstatedir}/libuuid/clock.txt
 %attr(-,uuidd,uuidd) %ghost %dir /run/uuidd
-%{uldatadir}/bash-completion/completions/uuidd
-%{ulmandir}/man8/uuidd.8.gz
-%{ulsbindir}/rcuuidd
+%{_datadir}/bash-completion/completions/uuidd
+%{_mandir}/man8/uuidd.8.gz
+%{_sbindir}/rcuuidd
 %{_unitdir}/uuidd.service
 %{_unitdir}/uuidd.socket
 %endif
@@ -1388,7 +1361,6 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
 
 %if "%ulbuild" == "python"
 %files %{python_files}
-%defattr(-, root, root)
 %{python_sitearch}/libmount
 %endif