diff --git a/secure/Makefile b/secure/Makefile
index fd492dd2dcfb..5607b5466c65 100644
--- a/secure/Makefile
+++ b/secure/Makefile
@@ -1,7 +1,10 @@
-#	$Id: Makefile,v 1.4 1994/09/07 07:16:37 pst Exp $
+#	$Id: Makefile,v 1.5 1994/09/07 07:47:03 pst Exp $
 
-# XXX usr.bin out until Geoff's master plan is done
-SUBDIR= lib
+# lib must be first, or it will not work.  This is because we reference
+# the lib's in the directory where they are built from the binaries we
+# want to build.
+
+SUBDIR= lib usr.bin sbin bin
 
 .include <bsd.subdir.mk>
 
diff --git a/secure/Makefile.inc b/secure/Makefile.inc
index 7883d4763d70..118dd226b4e1 100644
--- a/secure/Makefile.inc
+++ b/secure/Makefile.inc
@@ -1,3 +1,3 @@
-#	$Id$
+#	$Id: Makefile.inc,v 1.1 1994/08/07 19:04:10 wollman Exp $
 
-BINDIR=	/usr/bin
+DISTRIBUTION=des
diff --git a/secure/bin/Makefile b/secure/bin/Makefile
new file mode 100644
index 000000000000..7af79b32c4e6
--- /dev/null
+++ b/secure/bin/Makefile
@@ -0,0 +1,6 @@
+#	From: @(#)Makefile	8.1 (Berkeley) 5/31/93
+#	$Id: Makefile,v 1.2 1994/09/18 21:25:26 wollman Exp $
+
+SUBDIR=	ed
+
+.include <bsd.subdir.mk>
diff --git a/secure/bin/Makefile.inc b/secure/bin/Makefile.inc
new file mode 100644
index 000000000000..98638a362b48
--- /dev/null
+++ b/secure/bin/Makefile.inc
@@ -0,0 +1,5 @@
+#	@(#)Makefile.inc	8.1 (Berkeley) 5/31/93
+
+BINDIR?=	/bin
+NOSHARED?=	YES
+.include "${.CURDIR}/../../Makefile.inc"
diff --git a/secure/bin/ed/Makefile b/secure/bin/ed/Makefile
new file mode 100644
index 000000000000..65f03da7a5a6
--- /dev/null
+++ b/secure/bin/ed/Makefile
@@ -0,0 +1,13 @@
+#	$Id: Makefile,v 1.9 1994/10/29 10:13:34 phk Exp $
+
+PROG=	ed
+SRCS=	 buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c
+.PATH:	${.CURDIR}/../../../bin/ed
+LINKS=  ${BINDIR}/ed ${BINDIR}/red
+NOMAN=	true
+
+CFLAGS+=-DDES
+LDADD+= -L../../lib/libdescrypt -ldescrypt
+DPADD+= ../../lib/libcrypt/libdescrypt.a
+
+.include <bsd.prog.mk>
diff --git a/secure/lib/Makefile.inc b/secure/lib/Makefile.inc
index a03600e058d9..414219bf1af3 100644
--- a/secure/lib/Makefile.inc
+++ b/secure/lib/Makefile.inc
@@ -1,5 +1,6 @@
-#	$Id: Makefile.inc,v 1.1 1994/08/08 17:42:36 csgr Exp $
+#	$Id: Makefile.inc,v 1.2 1994/08/12 21:02:25 csgr Exp $
 
-.if exists(${.CURDIR}/../../../lib/Makefile.inc)
-.include "${.CURDIR}/../../../lib/Makefile.inc"
-.endif
+.include "${.CURDIR}/../../Makefile.inc"
+#.if exists(${.CURDIR}/../../../lib/Makefile.inc)
+#.include "${.CURDIR}/../../../lib/Makefile.inc"
+#.endif
diff --git a/secure/sbin/Makefile b/secure/sbin/Makefile
new file mode 100644
index 000000000000..32ef1f1dc8ab
--- /dev/null
+++ b/secure/sbin/Makefile
@@ -0,0 +1,6 @@
+#	$Id: Makefile,v 1.1 1994/09/07 07:16:49 pst Exp $
+
+SUBDIR= init
+
+.include <bsd.subdir.mk>
+
diff --git a/secure/sbin/Makefile.inc b/secure/sbin/Makefile.inc
new file mode 100644
index 000000000000..d8e8fa0c33b9
--- /dev/null
+++ b/secure/sbin/Makefile.inc
@@ -0,0 +1,6 @@
+#	$Id: Makefile.inc,v 1.1 1994/09/07 07:16:50 pst Exp $
+
+BINDIR=		/sbin
+
+NOSHARED?=	YES
+.include "${.CURDIR}/../../Makefile.inc"
diff --git a/secure/sbin/init/Makefile b/secure/sbin/init/Makefile
new file mode 100644
index 000000000000..48147c523428
--- /dev/null
+++ b/secure/sbin/init/Makefile
@@ -0,0 +1,12 @@
+#	@(#)Makefile	8.1 (Berkeley) 7/19/93
+
+PROG=	init
+NOMAN=	true
+DPADD=	../../lib/libcrypt/libdescrypt.a ${LIBUTIL}
+LDADD=	-L../../lib/libcrypt -lutil -ldescrypt
+.PATH:	${.CURDIR}/../../../sbin/init
+BINMODE=500
+INSTALLFLAGS=-fschg
+CFLAGS+=-DDEBUGSHELL -DSECURE
+
+.include <bsd.prog.mk>
diff --git a/secure/usr.bin/Makefile.inc b/secure/usr.bin/Makefile.inc
index 7883d4763d70..e09ccebf3f5d 100644
--- a/secure/usr.bin/Makefile.inc
+++ b/secure/usr.bin/Makefile.inc
@@ -1,3 +1,4 @@
-#	$Id$
+#	$Id: Makefile.inc,v 1.1 1994/09/07 07:16:50 pst Exp $
 
 BINDIR=	/usr/bin
+.include "${.CURDIR}/../../Makefile.inc"
diff --git a/secure/usr.bin/bdes/Makefile b/secure/usr.bin/bdes/Makefile
index c0e482bce2fd..1b19c58eb3ec 100644
--- a/secure/usr.bin/bdes/Makefile
+++ b/secure/usr.bin/bdes/Makefile
@@ -1,10 +1,10 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id: Makefile,v 1.3 1994/09/12 17:27:55 ache Exp $
+#	$Id: Makefile,v 1.4 1994/09/30 06:04:40 pst Exp $
 
 PROG=	bdes
 SRCS=	bdes.c
 
-LDADD+= -lcipher
-DPADD+= ${LIBCIPHER}
+LDADD+= -L../../lib/libcipher -lcipher
+DPADD+= ../../lib/libcipher/libcipher.a
 
 .include <bsd.prog.mk>