diff --git a/security/rsaref/Makefile b/security/rsaref/Makefile
index aa875a6655b0..3ebd7ab89e0c 100644
--- a/security/rsaref/Makefile
+++ b/security/rsaref/Makefile
@@ -4,7 +4,7 @@
 # Date created:         2 Feb 1997
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.3 1997/07/17 15:12:58 max Exp $
+# $Id: Makefile,v 1.4 1998/09/14 22:33:23 smace Exp $
 #
 
 PKGNAME=        rsaref-2.0
@@ -25,20 +25,11 @@ pre-configure:
 		cp md2.h _md2.h && \
 		cp md5.h _md5.h
 
-do-install:
-	cd ${WRKSRC} && \
-		${INSTALL_DATA} rsa.h _des.h _md2.h _md5.h rsaref.h global.h \
-			${PREFIX}/include
-	cd ${WRKSRC} && \
-		${INSTALL_DATA} librsaref.a librsaref.so.2 \
-			${PREFIX}/lib
-	(cd ${PREFIX}/lib; ln -sf librsaref.so.2 librsaref.so)
-	install -d -m 555 ${PREFIX}/share/doc/rsaref
-	cd ${WRKDIR}/doc && \
-		${INSTALL_DATA} info.txt rsaref.txt \
-			${PREFIX}/share/doc/rsaref
-
 post-install:
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+	install -d -m 555 ${PREFIX}/share/doc/rsaref
+	cd ${WRKDIR}/doc && ${INSTALL_DATA} info.txt rsaref.txt \
+                        ${PREFIX}/share/doc/rsaref
+
 
 .include <bsd.port.mk>
diff --git a/security/rsaref/files/Makefile b/security/rsaref/files/Makefile
index b091f351a28b..a121fe84e452 100644
--- a/security/rsaref/files/Makefile
+++ b/security/rsaref/files/Makefile
@@ -8,7 +8,11 @@ LIB= ar
 	${CC} -fpic -DPIC ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
 
 RSAREFLIB=librsaref.a
+.if ${PORTOBJFORMAT} == elf
 SORSAREFLIB=librsaref.so.2
+.else
+SORSAREFLIB=librsaref.so.2.0
+.endif
 
 all: ${RSAREFLIB} ${SORSAREFLIB}
 
@@ -21,10 +25,17 @@ $(RSAREFLIB) : desc.$(O) digit.$(O) md2c.$(O) md5c.$(O) nn.$(O) prime.$(O)\
 $(SORSAREFLIB) : desc.$(SO) digit.$(SO) md2c.$(SO) md5c.$(SO) nn.$(SO) prime.$(SO)\
   rsa.$(SO) r_encode.$(SO) r_dh.$(SO) r_enhanc.$(SO) r_keygen.$(SO) r_random.$(SO)\
   r_stdlib.$(SO)
-.if defined(PORTOBJFORMAT) && ${PORTOBJFORMAT} == elf
+.if ${PORTOBJFORMAT} == elf
 	${CC} -o $@ -shared -Wl,-soname,$@ $>
 .else
 	ld -Bshareable -x -o $@ $>
 .endif
 
-
+install:
+	install -c -m 444 -o bin -g bin rsa.h _des.h _md2.h _md5.h rsaref.h global.h ${PREFIX}/include
+.if ${PORTOBJFORMAT} == elf
+	install -c -m 644 -o bin -g bin librsaref.a librsaref.so.2 ${PREFIX}/lib
+	(cd ${PREFIX}/lib; ln -sf librsaref.so.2 librsaref.so)
+.else
+	install -c -m 644 -o bin -g bin librsaref.a librsaref.so.2.0 ${PREFIX}/lib
+.endif