--- ypserv-2.10/scripts/ypMakefile.in.makefix	2003-06-26 13:03:18.000000000 +0200
+++ ypserv-2.10/scripts/ypMakefile.in	2003-11-06 11:52:06.000000000 +0100
@@ -34,11 +34,11 @@
 
 # Should we merge the passwd file with the shadow file ?
 # MERGE_PASSWD=true|false
-MERGE_PASSWD=true
+MERGE_PASSWD=false
 
 # Should we merge the group file with the gshadow file ?
 # MERGE_GROUP=true|false
-MERGE_GROUP=true
+MERGE_GROUP=false
 
 # These are commands which this Makefile needs to properly rebuild the
 # NIS databases. Don't change these unless you have a good reason.
@@ -101,8 +101,8 @@
 # If you don't want some of these maps built, feel free to comment
 # them out from this list.
 
-all:  passwd group hosts rpc services netid protocols netgrp mail \
-	shadow publickey # networks ethers bootparams printcap \
+all:  passwd group hosts rpc services netid protocols shadow \
+	# mail netgrp publickey networks ethers bootparams printcap \
 	# amd.home auto.master auto.home auto.local passwd.adjunct \
 	# timezone locale netmasks