diff --git a/lib/libfetch/Makefile b/lib/libfetch/Makefile
index 1395f3e09a59..0d41258c1b10 100644
--- a/lib/libfetch/Makefile
+++ b/lib/libfetch/Makefile
@@ -10,7 +10,7 @@ MAN=		fetch.3
 CLEANFILES=	ftperr.h httperr.h
 
 .if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL)
-CFLAGS+=	-DWITH_SSL
+CFLAGS+=	-DWITH_SSL -DOPENSSL_NO_KRB5
 DPADD=		${LIBSSL} ${LIBCRYPTO}
 LDADD=		-lssl -lcrypto
 WARNS?=		2
diff --git a/lib/libmp/Makefile b/lib/libmp/Makefile
index 7d8c9cb2de1b..6bb7f79c45c7 100644
--- a/lib/libmp/Makefile
+++ b/lib/libmp/Makefile
@@ -7,6 +7,6 @@ INCS=		mp.h
 SRCS=		mpasbn.c
 
 WARNS?=		2
-CFLAGS+=	-ansi -pedantic
+CFLAGS+=	-I${.CURDIR}/../../crypto
 
 .include <bsd.lib.mk>
diff --git a/lib/libmp/mp.h b/lib/libmp/mp.h
index 056c6ba4c648..4c2c94d05fc8 100644
--- a/lib/libmp/mp.h
+++ b/lib/libmp/mp.h
@@ -3,7 +3,9 @@
 #ifndef _MP_H_
 #define _MP_H_
 
+#ifndef HEADER_BN_H_
 #include <openssl/bn.h>
+#endif
 
 typedef struct _mint {
 	BIGNUM *bn;
diff --git a/lib/libmp/mpasbn.c b/lib/libmp/mpasbn.c
index 0185e1f18514..726e2f179dc6 100644
--- a/lib/libmp/mpasbn.c
+++ b/lib/libmp/mpasbn.c
@@ -79,10 +79,10 @@ __FBSDID("$FreeBSD$");
 #include <stdlib.h>
 #include <string.h>
 
-#include <openssl/bn.h>
 #include <openssl/crypto.h>
 #include <openssl/err.h>
 
+#include "openssl/crypto/bn/bn_lcl.h"
 #include "mp.h"
 
 #define MPERR(s)	do { warn s; abort(); } while (0)