diff --git a/devel/readline/Makefile b/devel/readline/Makefile
index 3b8d497..ec253b1 100644
--- a/devel/readline/Makefile
+++ b/devel/readline/Makefile
@@ -18,6 +18,12 @@ USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 INFO_FILES=		yes
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD"
+CONFIGURE_ARGS+=	bash_cv_wcwidth_broken=no
+.endif
+
 BUILD_TARGET=		all-libtool examples
 INSTALL_TARGET=		install-libtool
 
diff --git a/mk/gnu-config/config.sub b/mk/gnu-config/config.sub
index 59bb593..b17828e 100755
--- a/mk/gnu-config/config.sub
+++ b/mk/gnu-config/config.sub
@@ -124,7 +124,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
   linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
@@ -259,7 +259,7 @@ case $basic_machine in
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+	| arc | arm | arm[bl]e | arme[lb] | armv[23456] | armv[3456][lb] | avr | avr32 \
         | be32 | be64 \
 	| bfin \
 	| c4x | clipper \
diff --git a/net/isc-dhcp4/Makefile.common b/net/isc-dhcp4/Makefile.common
index 9aaaa96..ec6f426 100644
--- a/net/isc-dhcp4/Makefile.common
+++ b/net/isc-dhcp4/Makefile.common
@@ -51,6 +51,7 @@ CONFIGURE_ARGS+=	--with-relay6-pid-file=${DHCP_PID}/isc-dhcrelay6.pid
 CONFIGURE_ENV+=		BUILD_CC=${NATIVE_CC:Q}
 .  if ${OPSYS} == "NetBSD"
 # Target will have /dev/random.
+CONFIGURE_ARGS+=	--with-randomdev=/dev/urandom
 CONFIGURE_ENV+=		ac_cv_file__dev_random=yes
 .  endif
 .endif