diff --git a/mail/libdkim/Makefile b/mail/libdkim/Makefile
index 6000ba3812ef..932bbbf8aa6b 100644
--- a/mail/libdkim/Makefile
+++ b/mail/libdkim/Makefile
@@ -22,12 +22,13 @@ USE_OPENSSL=	YES
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-BROKEN=		does not compile on FreeBSD 6.x
+#Check for OPENSSL 0.9.8 in BASE:  If not present require PORT
+.if !exists(${DESTDIR}/lib/libcrypto.so.5)
+WITH_OPENSSL_PORT=	YES
 .endif
 
+.include <bsd.port.pre.mk>
+
 post-patch:
 	${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.prev
 	@${SED} -e "s=%%SHLIB_MAJOR%%=${SHLIB_MAJOR}=g" \
diff --git a/mail/libdkim/files/Makefile b/mail/libdkim/files/Makefile
index c979609f97f5..684527884d66 100644
--- a/mail/libdkim/files/Makefile
+++ b/mail/libdkim/files/Makefile
@@ -8,8 +8,8 @@ SHLIB_MAJOR=	%%SHLIB_MAJOR%%
 
 LIBDIR=		${PREFIX}/lib
 INCLUDEDIR=	${PREFIX}/include
-CFLAGS+=	-DOPENSSL_FIPS -I${OPENSSLBASE}/include
-LDFLAGS+=	-lcrypto -L${OPENSSLBASE}/lib
+CFLAGS+=	-DOPENSSL_FIPS -I${OPENSSLINC}
+LDFLAGS+=	-lcrypto -L${OPENSSLLIB}
 
 NO_PROFILE=