diff --git a/shadow/.md5sum b/shadow/.md5sum
index 9068e46e..6e73e13e 100644
--- a/shadow/.md5sum
+++ b/shadow/.md5sum
@@ -2,3 +2,4 @@ d52af1b47b7a382bff9d0be6865f05ea  login.defs
 be8f69c2701118093af3d7f3bc02af16  pwck
 01bab2b152b8f2ae0056a467fa365797  shadow-4.0.15-noshadowgrp.diff
 a0452fa989f8ba45023cc5a08136568e  shadow-4.0.15.tar.bz2
+ed61f849a595731bf795010a4f3cea16  useradd-4.0.15.diff
diff --git a/shadow/Pkgfile b/shadow/Pkgfile
index ac4fb240..e7ba671c 100644
--- a/shadow/Pkgfile
+++ b/shadow/Pkgfile
@@ -4,13 +4,14 @@
 
 name=shadow
 version=4.0.15
-release=1
+release=2
 source=(ftp://ftp.pld.org.pl/software/shadow/$name-$version.tar.bz2 \
-	pwck login.defs shadow-4.0.15-noshadowgrp.diff)
+	pwck login.defs shadow-4.0.15-noshadowgrp.diff useradd-4.0.15.diff)
 
 build() {
     cd $name-$version
     patch -p1 < $SRC/shadow-4.0.15-noshadowgrp.diff
+    patch -p0 < $SRC/useradd-4.0.15.diff
 
     ./configure --prefix=/usr \
 		--mandir=/usr/man \
diff --git a/shadow/useradd-4.0.15.diff b/shadow/useradd-4.0.15.diff
new file mode 100644
index 00000000..700ee238
--- /dev/null
+++ b/shadow/useradd-4.0.15.diff
@@ -0,0 +1,17 @@
+--- src/useradd.c.orig	2006-03-29 20:45:56.981071520 +0200
++++ src/useradd.c	2006-03-29 22:39:13.312872040 +0200
+@@ -1765,12 +1765,14 @@
+ 		find_new_uid ();
+ 	}
+ 
++#if 0 /* jw */
+ 	/* do we have to add a group for that user? This is why we need to
+ 	 * open the group files in the open_files() function  --gafton */
+ 	if (!(nflg || gflg)) {
+ 		find_new_gid ();
+ 		grp_add ();
+ 	}
++#endif
+ 
+ 	usr_update ();
+