diff --git a/net/nbd-server/Makefile b/net/nbd-server/Makefile
index 1e3880ac4465..821b897c08b6 100644
--- a/net/nbd-server/Makefile
+++ b/net/nbd-server/Makefile
@@ -6,20 +6,20 @@
 #
 
 PORTNAME=	nbd-server
-PORTVERSION=	2.8.6
+PORTVERSION=	2.8.5
+PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	nbd
 DISTNAME=	nbd-${PORTVERSION}
 
-MAINTAINER=	xi@borderworlds.dk
+MAINTAINER=	rebehn@ant.uni-bremen.de
 COMMENT=	A server for the linux network block device (nbd)
 
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GNOME=	glib20
 USE_GETOPT_LONG=yes
-
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} --mandir=${PREFIX}/man --enable-lfs --enable-syslog
 
 PLIST_FILES=	bin/nbd-server
diff --git a/net/nbd-server/distinfo b/net/nbd-server/distinfo
index 8e7e0e216ac3..cea6af0bbcf4 100644
--- a/net/nbd-server/distinfo
+++ b/net/nbd-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (nbd-2.8.6.tar.bz2) = 8b4365853a01b24b97e0473a2f17cea4
-SHA256 (nbd-2.8.6.tar.bz2) = 0ccf16ae9d36d3499cee0cf578fa0c327b757a8515464bd4e7bf17b4d61f161a
-SIZE (nbd-2.8.6.tar.bz2) = 151582
+MD5 (nbd-2.8.5.tar.bz2) = 2c993cfb867875c024fc983d8d34ae0a
+SHA256 (nbd-2.8.5.tar.bz2) = dc77166f086712fa0d1ff63997d487d99eaac238819b1aebff9a8fddfcc0b835
+SIZE (nbd-2.8.5.tar.bz2) = 151053
diff --git a/net/nbd-server/files/patch-nbd-server.c b/net/nbd-server/files/patch-nbd-server.c
new file mode 100644
index 000000000000..10f840e6b9fc
--- /dev/null
+++ b/net/nbd-server/files/patch-nbd-server.c
@@ -0,0 +1,18 @@
+diff -urN nbd-2.8.3.orig/nbd-server.c nbd-2.8.3/nbd-server.c
+--- nbd-2.8.3.orig/nbd-server.c	Thu Dec 22 21:37:20 2005
++++ nbd-server.c	Sun Jan  8 16:45:30 2006
+@@ -363,12 +363,12 @@
+  * is severely wrong)
+  **/
+ void sigchld_handler(int s) {
+-        int* status=NULL;
++        int status;
+ 	int* i;
+ 	pid_t pid;
+ 	int done=0;
+ 
+-	while(!done && (pid=wait(status)) > 0) {
++	while(!done && (pid=wait(&status)) > 0) {
+ 		if(WIFEXITED(status)) {
+ 			msg3(LOG_INFO, "Child exited with %d", WEXITSTATUS(status));
+ 			msg3(LOG_INFO, "pid is %d", pid);