diff --git a/lib/libc/gen/Makefile b/lib/libc/gen/Makefile
index 1b12099..8b8909f 100644
--- a/lib/libc/gen/Makefile
+++ b/lib/libc/gen/Makefile
@@ -1,14 +1,14 @@
 #
 # Makefile for libc/gen.
 #
-# $Id: Makefile,v 1.6 1997/10/03 04:44:14 gdr Exp $
+# $Id: Makefile,v 1.7 1998/02/09 08:25:39 taubert Exp $
 #
 
 .INCLUDE:	../../../paths.mk
 .INCLUDE: 	../../const.mk
 
-OBJ_ASM	= crypta.o setjmp.o syslog.o
-OBJ_C	= basename.o bmem.o compat.o crypt.o dirent.o err.o fnmatch.o fts.o \
+OBJ_ASM	= setjmp.o syslog.o
+OBJ_C	= basename.o bmem.o compat.o dirent.o err.o fnmatch.o fts.o \
 	  getcwd.o getgrent.o getpass.o getpwent.o getttyent.o hostname.o \
 	  oldlog.o popen.o psignal.o pwcache.o scandir.o siglist.o sleep.o \
 	  tty.o utime.o
diff --git a/lib/libcrypt/Makefile b/lib/libcrypt/Makefile
new file mode 100755
index 0000000..7b57ff7
--- /dev/null
+++ b/lib/libcrypt/Makefile
@@ -0,0 +1,13 @@
+#
+# Makefile for libcrypt
+#
+# $Id: Makefile,v 1.1 1998/02/09 08:25:32 taubert Exp $
+#
+
+LIB=	crypt
+OBJ_ASM=crypta.o
+OBJ_C=	crypt.o
+
+OBJS=	$(OBJ_ASM) $(OBJ_C)
+
+.INCLUDE: /src/gno/lib/lib.mk
diff --git a/lib/libc/gen/crypt.c b/lib/libcrypt/crypt.c
similarity index 99%
rename from lib/libc/gen/crypt.c
rename to lib/libcrypt/crypt.c
index a4a0a3d..900bd45 100644
--- a/lib/libc/gen/crypt.c
+++ b/lib/libcrypt/crypt.c
@@ -5,7 +5,7 @@
  * January 19-22, 1992 by Jawaid Bazyar
  * Copyright 1992-1997, Procyon Inc.
  *
- * $Id: crypt.c,v 1.3 1998/02/08 03:20:23 gdr-ftp Exp $
+ * $Id: crypt.c,v 1.1 1998/02/09 08:25:33 taubert Exp $
  *
  * This file is formatted with tab stops every 8 columns.
  */
diff --git a/lib/libc/gen/crypta.asm b/lib/libcrypt/crypta.asm
similarity index 96%
rename from lib/libc/gen/crypta.asm
rename to lib/libcrypt/crypta.asm
index a3c0dc8..d22e789 100644
--- a/lib/libc/gen/crypta.asm
+++ b/lib/libcrypt/crypta.asm
@@ -3,7 +3,7 @@
 * 19-22 January 1992 by Jawaid Bazyar
 * Copyright 1992, Procyon Inc.
 *
-* $Id: crypta.asm,v 1.3 1998/02/08 03:20:25 gdr-ftp Exp $
+* $Id: crypta.asm,v 1.1 1998/02/09 08:25:34 taubert Exp $
 *
 * Because of the four storage blocks listed below (copyOfData, e, ikey, and
 * yb), this doesn't seem to be compatible with the large memory model.
@@ -11,12 +11,11 @@
 * libc_gen__ load segment.
 *
 	case	on
-
-dummy	start			; ends up in .root
-	end
-
 	mcopy	crypta.mac
 
+dummy	START			; ends up in .root
+	END
+
 * void __crypt_transpose (struct block *data, struct ordering *t, int n);
 __crypt_transpose START
 	subroutine (2:n,4:t,4:data),2
diff --git a/lib/libc/gen/crypta.mac b/lib/libcrypt/crypta.mac
similarity index 100%
rename from lib/libc/gen/crypta.mac
rename to lib/libcrypt/crypta.mac