diff --git a/Makefile b/Makefile
index 58b2e934..842aa311 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.132 2009-05-13 23:27:00 nicm Exp $
+# $Id: Makefile,v 1.133 2009-05-14 00:17:37 nicm Exp $
 
 .SUFFIXES: .c .o
 .PHONY: clean
@@ -11,7 +11,7 @@ CC?= cc
 CFLAGS+= -DBUILD="\"$(VERSION)\""
 CPPFLAGS:= -I. -I- -I/usr/local/include ${CPPFLAGS}
 LDFLAGS+= -L/usr/local/lib
-LIBS+= -lutil -lncurses
+LIBS+= -lncurses
 
 .ifdef FDEBUG
 LDFLAGS+= -Wl,-E
diff --git a/configure b/configure
index 152b8dc9..e0a14589 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: configure,v 1.4 2009-05-14 00:12:42 nicm Exp $
+# $Id: configure,v 1.5 2009-05-14 00:17:37 nicm Exp $
 
 CONFIG_H=config.h
 CONFIG_MK=config.mk
@@ -30,6 +30,7 @@ case `uname` in
 EOF
 	cat <<EOF >>$CONFIG_MK
 SRCS+= osdep-openbsd.c
+LIBS+= -lutil
 EOF
 	;;
 # ------------------------------------------------------------------------------
@@ -136,7 +137,7 @@ EOF
 EOF
 	cat <<EOF >>$CONFIG_MK
 SRCS+= osdep-freebsd.c
-LIBS+= -lcrypt
+LIBS+= -lcrypt -lutil
 EOF
 	;;
 # ------------------------------------------------------------------------------