diff --git a/security/nss/lib/freebl/Makefile b/security/nss/lib/freebl/Makefile
index f61fbc9cf7d..5e703f16193 100644
--- a/security/nss/lib/freebl/Makefile
+++ b/security/nss/lib/freebl/Makefile
@@ -98,7 +98,7 @@ ifdef NS_USE_GCC
     ASFILES  =
     DEFINES += -DMP_NO_MP_WORD -DMP_USE_UINT_DIGIT
 else
-    ASFILES  = mpi_x86.asm
+    MPI_SRCS += mpi_x86.c
     DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE 
     DEFINES += -DMP_ASSEMBLY_DIV_2DX1D -DMP_USE_UINT_DIGIT -DMP_NO_MP_WORD
     ifdef BUILD_OPT
@@ -112,12 +112,6 @@ ifeq ($(OS_TARGET),WINCE)
     DEFINES += -DSHA_NO_LONG_LONG # avoid 64-bit arithmetic in SHA512
 endif
 
-ifdef XP_OS2_VACPP
-    ASFILES  = mpi_x86.asm
-    DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE 
-    DEFINES += -DMP_ASSEMBLY_DIV_2DX1D -DMP_USE_UINT_DIGIT -DMP_NO_MP_WORD
-endif
-
 ifeq ($(OS_TARGET),IRIX)
 ifeq ($(USE_N32),1)
     ASFILES  = mpi_mips.s
@@ -404,7 +398,6 @@ vpath %.h mpi ecl
 vpath %.c mpi ecl
 vpath %.S mpi ecl
 vpath %.s mpi ecl
-vpath %.asm mpi ecl
 INCLUDES += -Impi -Iecl
 
 
diff --git a/security/nss/lib/freebl/mpi/mpi_x86.c b/security/nss/lib/freebl/mpi/mpi_x86.c
new file mode 100644
index 00000000000..e69de29bb2d