diff --git a/shadow.changes b/shadow.changes
index 05477b5..18731c3 100644
--- a/shadow.changes
+++ b/shadow.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Thu Sep 14 08:18:27 UTC 2017 - mvetter@suse.com
+
+- boo#1048645:
+  Set suid bit for newuidmap and newgimap
+
+-------------------------------------------------------------------
+Thu Sep 14 08:17:08 UTC 2017 - mvetter@suse.com
+
+- Revert the changes for bsc#1023895 back
+  Pulls in too many deps into ring0.
+  Next version of shadow plans to have no conditional man pages.
+
 -------------------------------------------------------------------
 Fri Sep  8 11:41:13 UTC 2017 - mvetter@suse.com
 
diff --git a/shadow.spec b/shadow.spec
index 1fc6bfd..15575be 100644
--- a/shadow.spec
+++ b/shadow.spec
@@ -46,15 +46,11 @@ Patch11:        useradd-mkdirs.patch
 Patch18:        shadow-4.1.5.1-pam_group.patch
 Patch20:        disable_new_audit_function.patch
 BuildRequires:  audit-devel > 2.3
-BuildRequires:  docbook-xsl-stylesheets
-BuildRequires:  docbook_4
 BuildRequires:  libacl-devel
 BuildRequires:  libattr-devel
 BuildRequires:  libselinux-devel
 BuildRequires:  libsemanage-devel
 BuildRequires:  pam-devel
-BuildRequires:  xml2po
-BuildRequires:  xsltproc
 BuildRequires:  xz
 Requires:       group(root)
 Requires:       user(root)
@@ -103,8 +99,7 @@ export LDFLAGS="-pie"
         --with-selinux \
         --without-libcrack \
         --disable-shared \
-	--with-group-name-max-length=32 \
-	--enable-man
+	--with-group-name-max-length=32
 make
 
 %install
@@ -233,8 +228,8 @@ rm -rf %{buildroot}%{_mandir}/{??,??_??}
 %verify(not mode) %attr(4755,root,shadow) %{_bindir}/gpasswd
 %verify(not mode) %attr(4755,root,root) %{_bindir}/newgrp
 %verify(not mode) %attr(4755,root,shadow) %{_bindir}/passwd
-%verify(not mode) %attr(0755,root,shadow) %{_bindir}/newgidmap
-%verify(not mode) %attr(0755,root,shadow) %{_bindir}/newuidmap
+%verify(not mode) %attr(4755,root,shadow) %{_bindir}/newgidmap
+%verify(not mode) %attr(4755,root,shadow) %{_bindir}/newuidmap
 %{_bindir}/lastlog
 %{_bindir}/sg
 %{_sbindir}/groupadd