--- a/configure.in
+++ b/configure.in
@@ -10,6 +10,14 @@ AC_CONFIG_SRCDIR([src/rpcbind.c])
 	rpcuser=root)
 	AC_SUBST(rpcuser)
 AC_DEFINE_UNQUOTED(RPCBIND_USER, "$rpcuser", [This defines the uid to run as])
+                    
+AC_ARG_ENABLE(libwrap,[  --enable-libwrap      Turns on tcp wrappes support], 
+	[case "${enableval}" in
+		yes) libwrap=true ;;
+		no)  libwrap=false ;;
+		*) AC_MSG_ERROR(bad value ${enableval} for --enable-libwrap) ;;
+	esac],[libwrap=false])
+AM_CONDITIONAL(WRAP, test x$libwrap = xtrue)
 
 AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h \
                   netinet/in.h stdlib.h string.h \
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,6 +9,10 @@
 INCLUDES +=	-DWARMSTART
 endif
 
+if WRAP
+INCLUDES +=	-DLIBWRAP
+WRAPLIB =	-lwrap
+endif
 
 bin_PROGRAMS = rpcbind rpcinfo
 
@@ -24,7 +28,7 @@
 rpcinfo_LDADD   =       $(LIB_TIRPC)
 
 
-rpcbind_LDFLAGS = -lpthread -ltirpc
+rpcbind_LDFLAGS = -lpthread -ltirpc $(WRAPLIB)
 rpcbind_LDADD = $(LIB_TIRPC)
 AM_CPPFLAGS = -I/usr/include/tirpc -DCHECK_LOCAL -DPORTMAP \
                        -DFACILITY=LOG_MAIL -DSEVERITY=LOG_INFO