diff --git a/net-p2p/libfreenet/Makefile b/net-p2p/libfreenet/Makefile
index b236312a8476..0f3746d7ac1c 100644
--- a/net-p2p/libfreenet/Makefile
+++ b/net-p2p/libfreenet/Makefile
@@ -7,11 +7,11 @@
 #
 
 PORTNAME=	libfreenet
-PORTVERSION=	0.3.0
+PORTVERSION=	0.4.0
 CATEGORIES=	net
 MASTER_SITES=	http://thalassocracy.org/libfreenet/
 
-MAINTAINER=	ijliao@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 USE_OPENSSL=	yes
 USE_LIBTOOL=	yes
diff --git a/net-p2p/libfreenet/distinfo b/net-p2p/libfreenet/distinfo
index 6d5d3cd6ab36..6946435a70da 100644
--- a/net-p2p/libfreenet/distinfo
+++ b/net-p2p/libfreenet/distinfo
@@ -1 +1 @@
-MD5 (libfreenet-0.3.0.tar.gz) = fa474ed2ca43acd759fdefebf636b855
+MD5 (libfreenet-0.4.0.tar.gz) = 9fa1231689528a46821a7728802469f1
diff --git a/net-p2p/libfreenet/files/patch-testserver.c b/net-p2p/libfreenet/files/patch-testserver.c
new file mode 100644
index 000000000000..876e5a6733f1
--- /dev/null
+++ b/net-p2p/libfreenet/files/patch-testserver.c
@@ -0,0 +1,10 @@
+--- testserver.c.orig	Tue May 22 05:04:28 2001
++++ testserver.c	Sun May 27 18:47:01 2001
+@@ -19,6 +19,7 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <stdlib.h>
++#include <netinet/in.h>
+ #include <sys/socket.h>
+ 
+ 
diff --git a/net-p2p/libfreenet/pkg-plist b/net-p2p/libfreenet/pkg-plist
index 02b8e3efa13c..a46a92fa1bd4 100644
--- a/net-p2p/libfreenet/pkg-plist
+++ b/net-p2p/libfreenet/pkg-plist
@@ -1,5 +1,6 @@
 bin/testclient
 bin/testserver
+include/libfreenet/acconfig.h
 include/libfreenet/base64.h
 include/libfreenet/client.h
 include/libfreenet/client_util.h
@@ -8,6 +9,7 @@ include/libfreenet/endtoend.h
 include/libfreenet/protocol.h
 include/libfreenet/rijndael-alg-fst.h
 include/libfreenet/rijndael-api-fst.h
+include/libfreenet/stream.h
 include/libfreenet/twofish.h
 include/libfreenet/uri.h
 include/libfreenet/util.h
diff --git a/net/libfreenet/Makefile b/net/libfreenet/Makefile
index b236312a8476..0f3746d7ac1c 100644
--- a/net/libfreenet/Makefile
+++ b/net/libfreenet/Makefile
@@ -7,11 +7,11 @@
 #
 
 PORTNAME=	libfreenet
-PORTVERSION=	0.3.0
+PORTVERSION=	0.4.0
 CATEGORIES=	net
 MASTER_SITES=	http://thalassocracy.org/libfreenet/
 
-MAINTAINER=	ijliao@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 USE_OPENSSL=	yes
 USE_LIBTOOL=	yes
diff --git a/net/libfreenet/distinfo b/net/libfreenet/distinfo
index 6d5d3cd6ab36..6946435a70da 100644
--- a/net/libfreenet/distinfo
+++ b/net/libfreenet/distinfo
@@ -1 +1 @@
-MD5 (libfreenet-0.3.0.tar.gz) = fa474ed2ca43acd759fdefebf636b855
+MD5 (libfreenet-0.4.0.tar.gz) = 9fa1231689528a46821a7728802469f1
diff --git a/net/libfreenet/files/patch-testserver.c b/net/libfreenet/files/patch-testserver.c
new file mode 100644
index 000000000000..876e5a6733f1
--- /dev/null
+++ b/net/libfreenet/files/patch-testserver.c
@@ -0,0 +1,10 @@
+--- testserver.c.orig	Tue May 22 05:04:28 2001
++++ testserver.c	Sun May 27 18:47:01 2001
+@@ -19,6 +19,7 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <stdlib.h>
++#include <netinet/in.h>
+ #include <sys/socket.h>
+ 
+ 
diff --git a/net/libfreenet/pkg-plist b/net/libfreenet/pkg-plist
index 02b8e3efa13c..a46a92fa1bd4 100644
--- a/net/libfreenet/pkg-plist
+++ b/net/libfreenet/pkg-plist
@@ -1,5 +1,6 @@
 bin/testclient
 bin/testserver
+include/libfreenet/acconfig.h
 include/libfreenet/base64.h
 include/libfreenet/client.h
 include/libfreenet/client_util.h
@@ -8,6 +9,7 @@ include/libfreenet/endtoend.h
 include/libfreenet/protocol.h
 include/libfreenet/rijndael-alg-fst.h
 include/libfreenet/rijndael-api-fst.h
+include/libfreenet/stream.h
 include/libfreenet/twofish.h
 include/libfreenet/uri.h
 include/libfreenet/util.h