diff --git a/bird.changes b/bird.changes
index cd7715e..575139c 100644
--- a/bird.changes
+++ b/bird.changes
@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Wed Sep 27 14:17:55 UTC 2023 - Libor Pechacek <lpechacek@gmx.com>
 
-- Fix build - add 'shadow' to BuildRequires
+- add 'shadow' to Requires(pre)
 
 -------------------------------------------------------------------
 Thu Jun 22 15:39:36 UTC 2023 - Martin Hauke <mardnh@gmx.de>
@@ -164,7 +164,7 @@ Fri Sep 11 07:16:11 UTC 2020 - Dirk Mueller <dmueller@suse.com>
 -------------------------------------------------------------------
 Wed Jun 17 11:26:13 UTC 2020 - Paolo Stivanin <info@paolostivanin.com>
 
-- Add -fcommon to allow building against GCC10 
+- Add -fcommon to allow building against GCC10
 
 -------------------------------------------------------------------
 Wed Sep 18 19:14:22 UTC 2019 - Martin Hauke <mardnh@gmx.de>
diff --git a/bird.spec b/bird.spec
index a00da8b..ecb2348 100644
--- a/bird.spec
+++ b/bird.spec
@@ -35,8 +35,8 @@ BuildRequires:  flex
 BuildRequires:  ncurses-devel
 BuildRequires:  pkgconfig
 BuildRequires:  readline-devel
-BuildRequires:  shadow
-BuildRequires:  pkgconfig(systemd)
+BuildRequires:  systemd-rpm-macros
+Requires(pre):  shadow
 Provides:       bird6 = %{version}
 Provides:       bird6:%{_sbindir}/bird6
 Obsoletes:      bird6 < %{version}
@@ -67,7 +67,7 @@ This package holds the HTML documentation.
 %setup -q
 
 %build
-export CFLAGS="${RPM_OPT_FLAGS} -fpic -DPIC -fno-strict-aliasing -Wno-parentheses -Wno-pointer-sign"
+export CFLAGS="%{optflags} -fpic -DPIC -fno-strict-aliasing -Wno-parentheses -Wno-pointer-sign"
 export LDFLAGS="-Wl,-z,relro -pie"
 %configure \
 	--with-runtimedir=%{bird_runtimedir}
@@ -85,7 +85,7 @@ install -D -d -m 0750 %{buildroot}%{bird_home}
 install -D -d -m 0750 %{buildroot}%{_docdir}/%{name}/
 
 %check
-make test
+%make_build test
 
 %pre
 # Create bird user/group