diff --git a/mozilla/security/nss/lib/freebl/Makefile b/mozilla/security/nss/lib/freebl/Makefile
index c761cafd17f..a84437f4f57 100644
--- a/mozilla/security/nss/lib/freebl/Makefile
+++ b/mozilla/security/nss/lib/freebl/Makefile
@@ -89,3 +89,26 @@ private_export::
 	$(NSINSTALL) -m 777 $(libbsafe) $(DIST)/lib; \
 
 endif
+
+mp%.c : mpi/mp%.c
+	cd mpi; cp $@ ..
+
+mp%.h : mpi/mp%.h
+	cd mpi; cp $@ ..
+
+logtab.h : mpi/logtab.h
+	cd mpi; cp $@ ..
+
+primes.c : mpi/primes.c
+	cd mpi; cp $@ ..
+
+.PRECIOUS : $(MPI_SRCS) $(MPI_HDRS)
+
+ALL_TRASH += $(MPI_SRCS) $(MPI_HDRS)
+DEFINES += -DMP_API_COMPATIBLE
+
+MPI_OBJS = $(addprefix $(OBJDIR)/$(PROG_PREFIX), $(MPI_SRCS:.c=$(OBJ_SUFFIX)))
+
+$(MPI_OBJS): $(MPI_HDRS) primes.c
+
+
diff --git a/mozilla/security/nss/lib/freebl/manifest.mn b/mozilla/security/nss/lib/freebl/manifest.mn
index f0d38f6768b..910f06a8166 100644
--- a/mozilla/security/nss/lib/freebl/manifest.mn
+++ b/mozilla/security/nss/lib/freebl/manifest.mn
@@ -46,13 +46,16 @@ EXPORTS = \
 PRIVATE_EXPORTS = \
 	$(NULL)
 
+MPI_HDRS = mpi-config.h mpi.h mpi-priv.h mplogic.h mpprime.h logtab.h
+MPI_SRCS = mpprime.c mpmontg.c mplogic.c mpi.c 
+
 ifdef MOZILLA_BSAFE_BUILD
 CSRCS = \
 	fblstdlib.c \
 	sha_fast.c \
 	md2.c \
 	md5.c \
-	dh.c \
+	dh_bsf.c \
 	blapi_bsf.c \
 	$(NULL)
 else
@@ -63,6 +66,8 @@ CSRCS = \
 	md5.c \
 	alg2268.c \
 	arcfour.c \
+	$(MPI_SRCS) \
+	dh.c \
 	$(NULL)
 endif