diff --git a/configure b/configure
index d815c7aa90cc9de144fe09c5bb8b97da1bb7808b..18aed433bac3c317ea1b50e26e24df26ef1e6dab 100755
--- a/configure
+++ b/configure
@@ -2141,7 +2141,7 @@ esac
 tools=
 if test `expr "$target_list" : ".*softmmu.*"` != 0 ; then
   tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools"
-  if [ "$linux" = "yes" ] ; then
+  if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then
       tools="qemu-nbd\$(EXESUF) $tools"
     if [ "$check_utests" = "yes" ]; then
       tools="check-qint check-qstring check-qdict check-qlist $tools"
diff --git a/qemu-nbd.c b/qemu-nbd.c
index 6cdb83473f9f215578d5ea61374a1075a389bee6..91ea01414d1abe3e7ef811658df0ef6d7c6f64b9 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -30,6 +30,7 @@
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
 #include <signal.h>
+#include <libgen.h>
 
 #define SOCKET_PATH    "/var/lock/qemu-nbd-%s"