diff --git a/security/openssl-beta/Makefile b/security/openssl-beta/Makefile
index 1a459f2b44f5..7da65b5e25c1 100644
--- a/security/openssl-beta/Makefile
+++ b/security/openssl-beta/Makefile
@@ -3,7 +3,7 @@
 # Date created:		15 Aug 1997
 # Whom:			markm@freebsd.org
 #
-# $Id: Makefile,v 1.14 1997/08/16 12:19:55 andreas Exp $
+# $Id: Makefile,v 1.15 1997/08/16 13:15:03 andreas Exp $
 
 DISTNAME=		SSLeay-0.8.1
 CATEGORIES=		devel security
@@ -33,8 +33,6 @@ post-configure:
 .endif
 
 post-install:
-	# needed to build apache-ssl port
-	${CP} ${WRKSRC}/libRSAglue.a ${PREFIX}/lib
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/SSLeay
 	@${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/SSLeay
diff --git a/security/openssl-beta/files/patch-ab b/security/openssl-beta/files/patch-ab
index 651c70a0922e..184f8010307e 100644
--- a/security/openssl-beta/files/patch-ab
+++ b/security/openssl-beta/files/patch-ab
@@ -1,43 +1,28 @@
---- util/mk1mf.pl.orig	Thu Dec  5 08:25:31 1996
-+++ util/mk1mf.pl	Wed Dec 11 22:37:57 1996
-@@ -6,7 +6,7 @@
- # funny stuff
- #
- 
--$INSTALLTOP="/usr/local/ssl";
-+$INSTALLTOP="/usr/local";
- 
- $infile="MINFO";
- 
-@@ -244,6 +244,7 @@
- TEST_D=\$(OUT_D)
- LIB_D=\$(OUT_D)
- INC_D=\$(OUT_D)
-+APPL_D=apps
- 
- # INCL_D - local library directory
- # OBJ_D  - temp object file directory
-@@ -281,14 +282,17 @@
- exe: \$(T_EXE) \$(BIN_D)$o\$(E_EXE)$exep
- 
- install:
--	\$(MKDIR) \$(INSTALLTOP)
--	\$(MKDIR) \$(INSTALLTOP)${o}bin
--	\$(MKDIR) \$(INSTALLTOP)${o}include
--	\$(MKDIR) \$(INSTALLTOP)${o}lib
-+	-\$(MKDIR) \$(INSTALLTOP)
-+	-\$(MKDIR) \$(INSTALLTOP)${o}bin
-+	-\$(MKDIR) \$(INSTALLTOP)${o}etc
-+	-\$(MKDIR) \$(INSTALLTOP)${o}include
-+	-\$(MKDIR) \$(INSTALLTOP)${o}lib
- 	\$(CP) \$(INC_D)${o}*.h \$(INSTALLTOP)${o}include
-+	\$(CP) \$(APPL_D)${o}ssleay.cnf \$(INSTALLTOP)${o}etc
- 	\$(CP) \$(BIN_D)$o\$(E_EXE)$exep \$(INSTALLTOP)${o}bin
--	\$(CP) \$(LIB_D)$o\$(O_SSL) \$(INSTALLTOP)${o}lib
--	\$(CP) \$(LIB_D)$o\$(O_CRYPTO) \$(INSTALLTOP)${o}lib
-+	\$(CP) \$(O_SSL) \$(INSTALLTOP)${o}lib
-+	\$(CP) \$(O_CRYPTO) \$(INSTALLTOP)${o}lib
-+	\$(CP) \$(O_RSAGLUE) \$(INSTALLTOP)${o}lib
- 
- clean:
- 	\$(RM) \$(TMP_D)$o*.*
+*** Makefile.ssl.ORIG	Tue Feb 17 21:43:38 1998
+--- Makefile.ssl	Tue Feb 17 21:46:22 1998
+***************
+*** 122,128 ****
+  	VERSION PROBLEMS MINFO makefile.one e_os.h \
+  	MICROSOFT makevms.com
+  WDIRS=	windows
+! LIBS=	libcrypto.a libssl.a 
+  
+  GENERAL=	Makefile
+  BASENAME=	SSLeay
+--- 122,128 ----
+  	VERSION PROBLEMS MINFO makefile.one e_os.h \
+  	MICROSOFT makevms.com
+  WDIRS=	windows
+! LIBS=	libcrypto.a libssl.a libRSAglue.a
+  
+  GENERAL=	Makefile
+  BASENAME=	SSLeay
+***************
+*** 272,276 ****
+--- 272,277 ----
+  		sh util/ranlib.sh $(INSTALLTOP)/lib/$$i; \
+  		chmod 644 $(INSTALLTOP)/lib/$$i ); \
+  	done
++ 	cp apps/ssleay.cnf $(INSTALLTOP)/etc/ssleay.cnf.sample
+  
+  # DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/security/openssl-beta/pkg-plist b/security/openssl-beta/pkg-plist
index 7b0599e01c50..b7eb615137d1 100644
--- a/security/openssl-beta/pkg-plist
+++ b/security/openssl-beta/pkg-plist
@@ -166,11 +166,12 @@ include/txt_db.h
 include/x509.h
 include/x509_vfy.h
 lib/libRSAglue.a
+@exec ranlib %D/%F
 lib/libcrypto.a
 @exec ranlib %D/%F
 lib/libssl.a
 @exec ranlib %D/%F
-lib/ssleay.cnf
+etc/ssleay.cnf.sample
 share/doc/SSLeay/API.doc
 share/doc/SSLeay/a_verify.doc
 share/doc/SSLeay/apps.doc
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index 1a459f2b44f5..7da65b5e25c1 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -3,7 +3,7 @@
 # Date created:		15 Aug 1997
 # Whom:			markm@freebsd.org
 #
-# $Id: Makefile,v 1.14 1997/08/16 12:19:55 andreas Exp $
+# $Id: Makefile,v 1.15 1997/08/16 13:15:03 andreas Exp $
 
 DISTNAME=		SSLeay-0.8.1
 CATEGORIES=		devel security
@@ -33,8 +33,6 @@ post-configure:
 .endif
 
 post-install:
-	# needed to build apache-ssl port
-	${CP} ${WRKSRC}/libRSAglue.a ${PREFIX}/lib
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/SSLeay
 	@${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/SSLeay
diff --git a/security/openssl/files/patch-ab b/security/openssl/files/patch-ab
index 651c70a0922e..184f8010307e 100644
--- a/security/openssl/files/patch-ab
+++ b/security/openssl/files/patch-ab
@@ -1,43 +1,28 @@
---- util/mk1mf.pl.orig	Thu Dec  5 08:25:31 1996
-+++ util/mk1mf.pl	Wed Dec 11 22:37:57 1996
-@@ -6,7 +6,7 @@
- # funny stuff
- #
- 
--$INSTALLTOP="/usr/local/ssl";
-+$INSTALLTOP="/usr/local";
- 
- $infile="MINFO";
- 
-@@ -244,6 +244,7 @@
- TEST_D=\$(OUT_D)
- LIB_D=\$(OUT_D)
- INC_D=\$(OUT_D)
-+APPL_D=apps
- 
- # INCL_D - local library directory
- # OBJ_D  - temp object file directory
-@@ -281,14 +282,17 @@
- exe: \$(T_EXE) \$(BIN_D)$o\$(E_EXE)$exep
- 
- install:
--	\$(MKDIR) \$(INSTALLTOP)
--	\$(MKDIR) \$(INSTALLTOP)${o}bin
--	\$(MKDIR) \$(INSTALLTOP)${o}include
--	\$(MKDIR) \$(INSTALLTOP)${o}lib
-+	-\$(MKDIR) \$(INSTALLTOP)
-+	-\$(MKDIR) \$(INSTALLTOP)${o}bin
-+	-\$(MKDIR) \$(INSTALLTOP)${o}etc
-+	-\$(MKDIR) \$(INSTALLTOP)${o}include
-+	-\$(MKDIR) \$(INSTALLTOP)${o}lib
- 	\$(CP) \$(INC_D)${o}*.h \$(INSTALLTOP)${o}include
-+	\$(CP) \$(APPL_D)${o}ssleay.cnf \$(INSTALLTOP)${o}etc
- 	\$(CP) \$(BIN_D)$o\$(E_EXE)$exep \$(INSTALLTOP)${o}bin
--	\$(CP) \$(LIB_D)$o\$(O_SSL) \$(INSTALLTOP)${o}lib
--	\$(CP) \$(LIB_D)$o\$(O_CRYPTO) \$(INSTALLTOP)${o}lib
-+	\$(CP) \$(O_SSL) \$(INSTALLTOP)${o}lib
-+	\$(CP) \$(O_CRYPTO) \$(INSTALLTOP)${o}lib
-+	\$(CP) \$(O_RSAGLUE) \$(INSTALLTOP)${o}lib
- 
- clean:
- 	\$(RM) \$(TMP_D)$o*.*
+*** Makefile.ssl.ORIG	Tue Feb 17 21:43:38 1998
+--- Makefile.ssl	Tue Feb 17 21:46:22 1998
+***************
+*** 122,128 ****
+  	VERSION PROBLEMS MINFO makefile.one e_os.h \
+  	MICROSOFT makevms.com
+  WDIRS=	windows
+! LIBS=	libcrypto.a libssl.a 
+  
+  GENERAL=	Makefile
+  BASENAME=	SSLeay
+--- 122,128 ----
+  	VERSION PROBLEMS MINFO makefile.one e_os.h \
+  	MICROSOFT makevms.com
+  WDIRS=	windows
+! LIBS=	libcrypto.a libssl.a libRSAglue.a
+  
+  GENERAL=	Makefile
+  BASENAME=	SSLeay
+***************
+*** 272,276 ****
+--- 272,277 ----
+  		sh util/ranlib.sh $(INSTALLTOP)/lib/$$i; \
+  		chmod 644 $(INSTALLTOP)/lib/$$i ); \
+  	done
++ 	cp apps/ssleay.cnf $(INSTALLTOP)/etc/ssleay.cnf.sample
+  
+  # DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/security/openssl/pkg-plist b/security/openssl/pkg-plist
index 7b0599e01c50..b7eb615137d1 100644
--- a/security/openssl/pkg-plist
+++ b/security/openssl/pkg-plist
@@ -166,11 +166,12 @@ include/txt_db.h
 include/x509.h
 include/x509_vfy.h
 lib/libRSAglue.a
+@exec ranlib %D/%F
 lib/libcrypto.a
 @exec ranlib %D/%F
 lib/libssl.a
 @exec ranlib %D/%F
-lib/ssleay.cnf
+etc/ssleay.cnf.sample
 share/doc/SSLeay/API.doc
 share/doc/SSLeay/a_verify.doc
 share/doc/SSLeay/apps.doc