diff --git a/nsd/nsd.patch b/nsd/nsd.patch
new file mode 100644
index 0000000000..2d0df17707
--- /dev/null
+++ b/nsd/nsd.patch
@@ -0,0 +1,27 @@
+Index: query.c
+--- query.c.orig	2003-11-15 13:46:00.000000000 +0100
++++ query.c	2003-11-15 20:54:38.000000000 +0100
+@@ -64,7 +64,7 @@
+ #include "util.h"
+ 
+ #ifdef LIBWRAP
+-#include <tcpd.h>
++#include "tcpd.h"
+ 
+ int allow_severity = LOG_INFO;
+ int deny_severity = LOG_NOTICE;
+@@ -704,12 +704,10 @@
+ 			*t = 0;
+ 			
+ #endif /* AXFR_DAEMON_PREFIX */
+-			request_init(&request, RQ_DAEMON, AXFR_DAEMON, RQ_CLIENT_SIN, &q->addr, 0);
+-			sock_methods(&request);	/* This is to work around the bug in libwrap */
++			request_init(&request, RQ_DAEMON, AXFR_DAEMON, RQ_CLIENT_ADDR, &q->addr, 0);
+ 			if(!hosts_access(&request)) {
+ #ifdef AXFR_DAEMON_PREFIX
+-				request_init(&request, RQ_DAEMON, axfr_daemon, RQ_CLIENT_SIN, &q->addr, 0);
+-				sock_methods(&request);	/* This is to work around the bug in libwrap */
++				request_init(&request, RQ_DAEMON, axfr_daemon, RQ_CLIENT_ADDR, &q->addr, 0);
+ 				log_msg(LOG_ERR, "checking %s", axfr_daemon);
+ 				if(!hosts_access(&request)) {
+ #endif /* AXFR_DAEMON_PREFIX */
diff --git a/nsd/nsd.spec b/nsd/nsd.spec
index 1c01975211..6e7c1dca2c 100644
--- a/nsd/nsd.spec
+++ b/nsd/nsd.spec
@@ -24,8 +24,6 @@
 ##
 
 #   FIXME: rse: optional AXFR support via BIND8 named-xfer?
-#   FIXME: rse: optional libwrap support via {tcp,socket}_wrappers for AXFR
-#   FIXME: thl: libwrap can be (mis-)used for fsl, but the right side of the assignment must never be empty. this requires an "if"
 
 #   package information
 Name:         nsd
@@ -36,11 +34,12 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [EVAL]
 Group:        DNS
 License:      GPL
-Version:      1.2.2
-Release:      20031111
+Version:      1.2.3
+Release:      20031115
 
 #   package option
 %option       with_fsl  yes
+%option       with_wrap no
 
 #   list of sources
 Source0:      http://www.nlnetlabs.nl/downloads/nsd/nsd-%{version}.tar.gz
@@ -49,6 +48,7 @@ Source2:      nsd.zones
 Source3:      nsd.conf
 Source4:      example.com
 Source5:      fsl.nsd
+Patch0:       nsd.patch
 
 #   build information
 Prefix:       %{l_prefix}
@@ -59,6 +59,10 @@ PreReq:       OpenPKG, openpkg >= 20030718
 BuildPreReq:  fsl >= 1.3.0
 PreReq:       fsl >= 1.3.0
 %endif
+%if "%{with_wrap}" == "yes"
+BuildPreReq:  tcpwrappers
+PreReq:       tcpwrappers
+%endif
 AutoReq:      no
 AutoReqProv:  no
 
@@ -71,12 +75,21 @@ AutoReqProv:  no
 
 %prep
     %setup -q
+    %patch -p0
 
 %build
     #   configure programs
-    CC="%{l_cc}" \
-    CFLAGS="%{l_cflags -O}" \
-    LDFLAGS="%{l_ldflags}" \
+    export CC="%{l_cc}"
+    export CFLAGS="%{l_cflags -O}"
+    export CPPFLAGS="%{l_cppflags}"
+    export LDFLAGS="%{l_ldflags}"
+    export LIBS=""
+%if "%{with_wrap}" == "yes"
+    LIBS="$LIBS -lwrap"
+%endif
+%if "%{with_fsl}" == "yes"
+    LIBS="$LIBS %{l_fsl_ldflags} %{l_fsl_libs}"
+%endif
     ./configure \
         --prefix=%{l_prefix} \
         --with-configdir=%{l_prefix}/etc/nsd \
@@ -87,11 +100,13 @@ AutoReqProv:  no
         --with-dbfile=%{l_prefix}/var/nsd/nsd.db \
         --with-user="%{l_ruid}.%{l_rgid}" \
         --with-namedxfer=%{l_prefix}/libexec/bind/named-xfer \
-%if "%{with_fsl}" == "yes"
-        --with-libwrap="%{l_fsl_ldflags} %{l_fsl_libs}" \
-%endif
         --enable-bind8-stats \
         --disable-shared \
+%if "%{with_wrap}" == "yes"
+        --with-libwrap=%{l_prefix} \
+%else
+        --without-libwrap \
+%endif
         --disable-nls
 
     #   build programs