diff --git a/secure/lib/libcrypt/Makefile b/secure/lib/libcrypt/Makefile
index 39c64aba38b7..fa82e942ce31 100644
--- a/secure/lib/libcrypt/Makefile
+++ b/secure/lib/libcrypt/Makefile
@@ -1,12 +1,17 @@
 #
-# $Id$
+# $Id: Makefile,v 1.12 1997/02/22 14:40:27 peter Exp $
 #
 
 LCRYPTBASE=     libcrypt
-LCRYPTSO=       $(LCRYPTBASE).so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-
 LDCRYPTBASE=    libdescrypt
+
+.if ${BINFORMAT} != elf
+LCRYPTSO=       $(LCRYPTBASE).so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
 LDCRYPTSO=      $(LDCRYPTBASE).so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
+.else
+LCRYPTSO=       $(LCRYPTBASE).so.$(SHLIB_MAJOR)
+LDCRYPTSO=      $(LDCRYPTBASE).so.$(SHLIB_MAJOR)
+.endif
 
 .PATH:	${.CURDIR}/../../../lib/libmd
 
@@ -16,6 +21,10 @@ MAN3=	crypt.3
 CFLAGS+=	-I${.CURDIR}/../../../lib/libmd -Wall
 PRECIOUSLIB=	yes
 
+.if ${BINFORMAT} == elf
+SONAME=	${LCRYPTBASE}.so.$(SHLIB_MAJOR)
+.endif
+
 test:
 	cd test ; make test ; make clean
 
@@ -30,6 +39,13 @@ afterinstall:
 	rm -f $(LCRYPTSO); \
 	ln -s $(LDCRYPTSO) $(LCRYPTSO); \
 	fi
+.endif
+.if !defined(NOPIC) && defined(SHLIB_MAJOR) && ${BINFORMAT} == elf
+	@cd $(DESTDIR)/$(LIBDIR); \
+	if [ ! -e $(LCRYPTBASE).so ]; then \
+	rm -f $(LCRYPTBASE).so; \
+	ln -s $(LDCRYPTBASE).so libcrypt.so; \
+	fi
 .endif
 	@cd  $(DESTDIR)/$(LIBDIR); \
 	if [ ! -e $(LCRYPTBASE).a ]; then \