diff --git a/baselibs.conf b/baselibs.conf
index 96a432f2..5df8c49f 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -2,9 +2,6 @@ systemd
   supplements "packageand(systemd:pam-<targettype>)"
   -/lib/systemd/system/
   post "<prefix>%{_sbindir}/pam-config -a --systemd || :"
-# postun "if [ "$1" == "0" ]; then"
-# postun "<prefix>%{_sbindir}/pam-config -d --systemd || :"
-# postun "fi"
 libsystemd0
 libudev1
 nss-myhostname
diff --git a/systemd-mini.changes b/systemd-mini.changes
index ae85a326..4a6ae87f 100644
--- a/systemd-mini.changes
+++ b/systemd-mini.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Jun 24 17:43:22 UTC 2015 - hrvoje.senjan@gmail.com
+
+- Fix bootstrap build by guarding filelists (man pages don't get
+  built in bootstrap mode)
+- Drop commented sections from baselibs.conf, allows format_spec_file
+  to have a successful run
+
 -------------------------------------------------------------------
 Fri Jun 19 20:51:14 UTC 2015 - jengelh@inai.de
 
diff --git a/systemd-mini.spec b/systemd-mini.spec
index f107c788..f00a1516 100644
--- a/systemd-mini.spec
+++ b/systemd-mini.spec
@@ -1497,7 +1497,9 @@ exit 0
 %{_includedir}/libudev.h
 %{_libdir}/libudev.so
 %{_libdir}/pkgconfig/libudev.pc
+%if ! 0%{?bootstrap}
 %{_mandir}/man3/*udev*.3*
+%endif
 
 %if ! 0%{?bootstrap}
 %files logger
@@ -1510,8 +1512,10 @@ exit 0
 %files -n nss-myhostname
 %defattr(-, root, root)
 %{_sbindir}/nss-myhostname-config
+%if !0%{?bootstrap}
 %{_mandir}/man8/libnss_myhostname.*
 %{_mandir}/man8/nss-myhostname.*
+%endif
 /%{_lib}/*nss_myhostname*
 
 %files journal-gateway
@@ -1524,8 +1528,10 @@ exit 0
 %files -n nss-mymachines
 %defattr(-,root,root)
 %_libdir/libnss_mymachines.so*
+%if !0%{?bootstrap}
 %_mandir/man8/libnss_mymachines.*
 %_mandir/man8/nss-mymachines.*
 %endif
+%endif
 
 %changelog
diff --git a/systemd.changes b/systemd.changes
index ae85a326..4a6ae87f 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Jun 24 17:43:22 UTC 2015 - hrvoje.senjan@gmail.com
+
+- Fix bootstrap build by guarding filelists (man pages don't get
+  built in bootstrap mode)
+- Drop commented sections from baselibs.conf, allows format_spec_file
+  to have a successful run
+
 -------------------------------------------------------------------
 Fri Jun 19 20:51:14 UTC 2015 - jengelh@inai.de
 
diff --git a/systemd.spec b/systemd.spec
index a2b4e4a1..d844a0a5 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -1492,7 +1492,9 @@ exit 0
 %{_includedir}/libudev.h
 %{_libdir}/libudev.so
 %{_libdir}/pkgconfig/libudev.pc
+%if ! 0%{?bootstrap}
 %{_mandir}/man3/*udev*.3*
+%endif
 
 %if ! 0%{?bootstrap}
 %files logger
@@ -1505,8 +1507,10 @@ exit 0
 %files -n nss-myhostname
 %defattr(-, root, root)
 %{_sbindir}/nss-myhostname-config
+%if !0%{?bootstrap}
 %{_mandir}/man8/libnss_myhostname.*
 %{_mandir}/man8/nss-myhostname.*
+%endif
 /%{_lib}/*nss_myhostname*
 
 %files journal-gateway
@@ -1519,8 +1523,10 @@ exit 0
 %files -n nss-mymachines
 %defattr(-,root,root)
 %_libdir/libnss_mymachines.so*
+%if !0%{?bootstrap}
 %_mandir/man8/libnss_mymachines.*
 %_mandir/man8/nss-mymachines.*
 %endif
+%endif
 
 %changelog