diff --git a/security/cfs/Makefile b/security/cfs/Makefile
index d4fd669de7c..14026e0f1c2 100644
--- a/security/cfs/Makefile
+++ b/security/cfs/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 1999/10/27 19:05:06 fgsch Exp $
+# $OpenBSD: Makefile,v 1.6 1999/10/31 23:31:04 fgsch Exp $
 #
 
 DISTNAME=	cfs-1.3.3
@@ -14,8 +14,6 @@ MAN1=		cattach.1 cdetach.1 cmkdir.1 cpasswd.1
 MAN8=		ccat.8 cfsd.8 cname.8
 RESTRICTED=	"contains crypto code"
 
-BROKEN=		"build fails on cfs_fh.c"
-
 do-build:
 	(cd ${WRKSRC} ; sh make_with_bad_rpcgen cfs)
 
diff --git a/security/cfs/patches/patch-ad b/security/cfs/patches/patch-ad
new file mode 100644
index 00000000000..f9cf7798ad3
--- /dev/null
+++ b/security/cfs/patches/patch-ad
@@ -0,0 +1,11 @@
+--- cfs_fh.c.orig	Sun Oct 31 16:07:18 1999
++++ cfs_fh.c	Sun Oct 31 16:06:29 1999
+@@ -363,7 +363,7 @@
+ 
+ 
+ static fh_u roothandle;
+-cfs_fileid rootnode={1,0,"\0\0\0\0\0\0\0\0","/NOWHERE/null",NULL,NULL,0,NULL,NULL};/* fileid=1; should be unique */
++cfs_fileid rootnode={1,0,{0,0,0,0,0,0,0,0},{'/','N','O','W','H','E','R','E','/','n','u','l','l'},NULL,NULL,0,NULL,NULL};/* fileid=1; should be unique */
+ nfstime roottime={0,0};
+ 
+ static u_char magictest[8]={0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef};
diff --git a/security/cfs/patches/patch-ae b/security/cfs/patches/patch-ae
new file mode 100644
index 00000000000..00268b7365f
--- /dev/null
+++ b/security/cfs/patches/patch-ae
@@ -0,0 +1,14 @@
+--- cfs_des.c.orig	Wed Mar 20 14:57:56 1996
++++ cfs_des.c	Sun Oct 31 16:15:22 1999
+@@ -140,7 +140,10 @@
+ 	register key_offset;
+ 	int j,k;
+ 	static int lk= -1;
+-	static char lastkey[4][8]={"xxxxxxx","xxxxxxx","xxxxxxx","xxxxxxx"};
++	static char lastkey[4][8]={
++	    {'x','x','x','x','x','x','x'}, {'x','x','x','x','x','x','x'},
++	    {'x','x','x','x','x','x','x'}, {'x','x','x','x','x','x','x'}
++	};
+ 	static char expanded_key[4][128];
+ 
+ 	/* now caches 4 session keys.  drops least recently added  */
diff --git a/security/cfs/scripts/configure b/security/cfs/scripts/configure
deleted file mode 100644
index 102b04a6da7..00000000000
--- a/security/cfs/scripts/configure
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /bin/sh
-
-cat <<- E-O-F > ${WRKSRC}/cfsd.sh
-	#! /bin/sh
-	# Start the Cryptographic File System daemon.
-
-	if [ -x ${PREFIX}/sbin/cfsd ]; then
-	    echo -n ' cfsd'
-	    ${PREFIX}/sbin/cfsd >/dev/null 2>&1
-	fi
-E-O-F