diff --git a/net/socat/Makefile b/net/socat/Makefile
index be8d012273b..0e2cfe07ff0 100644
--- a/net/socat/Makefile
+++ b/net/socat/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.3 2006/07/19 11:43:55 alek Exp $
+# $OpenBSD: Makefile,v 1.4 2007/03/17 22:00:15 jolan Exp $
 
 COMMENT=	"socat is a relay for bidirectional data transfer" 
 
-DISTNAME=	socat-1.5.0.0
+DISTNAME=	socat-1.6.0.0
 CATEGORIES=	net
 
 HOMEPAGE=	http://www.dest-unreach.org/socat/
@@ -24,11 +24,11 @@ NO_REGRESS=	Yes
 CONFIGURE_STYLE=gnu
 
 pre-build:
-	perl -pi -e "s,!!LOCALBASE!!,${LOCALBASE},g" ${WRKSRC}/socat.1
+	perl -pi -e "s,!!LOCALBASE!!,${LOCALBASE},g" ${WRKSRC}/doc/socat.1
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/socat
-.for file in FAQ README SECURITY xio.help socat.html
+.for file in FAQ README SECURITY doc/xio.help doc/*.html doc/dest-unreach.css
 	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/socat
 .endfor
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/socat
diff --git a/net/socat/distinfo b/net/socat/distinfo
index 5aa6d6bfd09..722ecbcb503 100644
--- a/net/socat/distinfo
+++ b/net/socat/distinfo
@@ -1,4 +1,5 @@
-MD5 (socat-1.5.0.0.tar.gz) = ec3625130168176257f4239ece2508ae
-RMD160 (socat-1.5.0.0.tar.gz) = ddb9f15da3695af2175fc39df6279e7560544945
-SHA1 (socat-1.5.0.0.tar.gz) = d0bd0ceefab0c535e4dd890179847a3987bdcb70
-SIZE (socat-1.5.0.0.tar.gz) = 387800
+MD5 (socat-1.6.0.0.tar.gz) = 1c223880febe6d55703739a1c0fea27d
+RMD160 (socat-1.6.0.0.tar.gz) = 37b4f46e9e6ae49c2bf3a36ba94d3d63318a9826
+SHA1 (socat-1.6.0.0.tar.gz) = d7e20e67c2691926e965272520a844644226f0b9
+SHA256 (socat-1.6.0.0.tar.gz) = d01f01574f5e4b587f2f9de6f946f4d61b3dc57a90404f9e897ab0970ab37dc4
+SIZE (socat-1.6.0.0.tar.gz) = 427187
diff --git a/net/socat/patches/patch-doc_socat_1 b/net/socat/patches/patch-doc_socat_1
new file mode 100644
index 00000000000..a71accc6b9d
--- /dev/null
+++ b/net/socat/patches/patch-doc_socat_1
@@ -0,0 +1,18 @@
+$OpenBSD: patch-doc_socat_1,v 1.1 2007/03/17 22:00:15 jolan Exp $
+--- doc/socat.1.orig	Sat Mar 17 09:13:08 2007
++++ doc/socat.1	Sat Mar 17 09:14:01 2007
+@@ -2772,11 +2772,11 @@ error\&. 
+ .PP 
+ .SH "FILES" 
+ .PP 
+-/usr/bin/socat 
++!!LOCALBASE!!/bin/socat
+ .br 
+-/usr/bin/filan 
++!!LOCALBASE!!/bin/filan
+ .br 
+-/usr/bin/procan
++!!LOCALBASE!!/bin/procan
+ .PP 
+ .SH "ENVIRONMENT VARIABLES" 
+ .PP 
diff --git a/net/socat/patches/patch-socat_1 b/net/socat/patches/patch-socat_1
deleted file mode 100644
index 94c21f13812..00000000000
--- a/net/socat/patches/patch-socat_1
+++ /dev/null
@@ -1,18 +0,0 @@
-$OpenBSD: patch-socat_1,v 1.1.1.1 2005/04/30 13:27:17 alek Exp $
---- socat.1.orig	Sat Apr 30 15:18:52 2005
-+++ socat.1	Sat Apr 30 15:19:25 2005
-@@ -2013,11 +2013,11 @@ error\&. 
- .PP 
- .SH "FILES" 
- .PP 
--/usr/bin/socat 
-+!!LOCALBASE!!/bin/socat 
- .br 
--/usr/bin/filan 
-+!!LOCALBASE!!/bin/filan 
- .br 
--/usr/bin/procan
-+!!LOCALBASE!!/bin/procan
- .PP 
- .SH "CREDITS" 
- .PP 
diff --git a/net/socat/pkg/PLIST b/net/socat/pkg/PLIST
index 9a11285b43d..08f0c1f3b87 100644
--- a/net/socat/pkg/PLIST
+++ b/net/socat/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2005/04/30 13:27:17 alek Exp $
+@comment $OpenBSD: PLIST,v 1.2 2007/03/17 22:00:15 jolan Exp $
 bin/filan
 bin/procan
 bin/socat
@@ -7,6 +7,10 @@ share/doc/socat/
 share/doc/socat/FAQ
 share/doc/socat/README
 share/doc/socat/SECURITY
+share/doc/socat/dest-unreach.css
+share/doc/socat/socat-multicast.html
+share/doc/socat/socat-openssltunnel.html
+share/doc/socat/socat-tun.html
 share/doc/socat/socat.html
 share/doc/socat/xio.help
 share/examples/socat/