diff --git a/sysuser-tools.changes b/sysuser-tools.changes
index a77dcb5..974194d 100644
--- a/sysuser-tools.changes
+++ b/sysuser-tools.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Oct  9 13:51:42 UTC 2017 - dimstar@opensuse.org
+
+- Furhter enhance sysusers-generate-pre: inside the build
+  environment, it can be acceptable to be failing to create the
+  users (e.g when building sysuser-tools or system-user-root, since
+  those two packages have to be speificallty excluded). Always
+  return with error code 0 if /.buildenv exists.
+
 -------------------------------------------------------------------
 Wed Sep 27 11:06:52 UTC 2017 - dimstar@opensuse.org
 
diff --git a/sysusers-generate-pre b/sysusers-generate-pre
index dfbd7d7..c79114a 100644
--- a/sysusers-generate-pre
+++ b/sysusers-generate-pre
@@ -19,6 +19,8 @@ lines=`wc -l < "$tmpfile"`
 
 echo '#!/bin/bash'
 echo "tail -n $lines \$0 | /usr/sbin/sysusers2shadow"
-echo 'exit $?'
+echo 'RET=$?'
+echo 'test -f /.buildenv && exit 0'
+echo 'exit $RET'
 echo '######## data below ########'
 cat "$tmpfile"