diff --git a/CHANGES b/CHANGES
index 9b43c4c54636cacc0ea237adb1737300882fe57f..c080030bfd12c0adcbde45683d2750170844de07 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,9 @@
 
  Changes between 0.9.8f and 0.9.9  [xx XXX xxxx]
 
+  *) s390x assembler pack.
+     [Andy Polyakov]
+
   *) ARMv4 assembler pack. ARMv4 refers to v4 and later ISA, not CPU
      "family."
      [Andy Polyakov]
diff --git a/Configure b/Configure
index 72005414d7b53f65cfa2842e46349045da36071c..67145a4e9f379060d2077d0c505f19731ec6c824 100755
--- a/Configure
+++ b/Configure
@@ -126,7 +126,7 @@ my $sparcv9_asm="sparcv9cap.o sparccpuid.o:bn-sparcv9.o sparcv9-mont.o sparcv9a-
 my $sparcv8_asm=":sparcv8.o:des_enc-sparc.o fcrypt_b.o::::::::::";
 my $alpha_asm="alphacpuid.o:bn_asm.o alpha-mont.o:::::::::::";
 my $mips3_asm=":bn-mips3.o:::::::::::";
-my $s390x_asm=":bn_asm.o s390x-mont.o::aes_cbc.o aes-s390x.o:::sha1-s390x.o sha256-s390x.o sha512-s390x.o::::::";
+my $s390x_asm=":bn-s390x.o::aes_cbc.o aes-s390x.o:::sha1-s390x.o sha256-s390x.o sha512-s390x.o::::::";
 my $armv4_asm=":bn_asm.o armv4-mont.o::aes_cbc.o aes-armv4.o:::sha1-armv4-large.o sha256-armv4.o sha512-armv4.o::::::";
 my $no_asm="::::::::::::";
 
diff --git a/TABLE b/TABLE
index 3d6125d11b65acf6264a06a5e97e3f4c0e79ab43..e75f69f98de66e289f196c510dfd49e92d12cf52 100644
--- a/TABLE
+++ b/TABLE
@@ -3257,7 +3257,7 @@ $sys_id       =
 $lflags       = -ldl
 $bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL
 $cpuid_obj    = 
-$bn_obj       = bn_asm.o s390x-mont.o
+$bn_obj       = bn-s390x.o
 $des_obj      = 
 $aes_obj      = aes_cbc.o aes-s390x.o
 $bf_obj       = 
diff --git a/crypto/bn/Makefile b/crypto/bn/Makefile
index 2bd9e7f4e8876663439964290a2de866262cdbde..2cc6fd6a05e488b22659e8b59379942ab245401a 100644
--- a/crypto/bn/Makefile
+++ b/crypto/bn/Makefile
@@ -99,6 +99,9 @@ bn-mips3.o:	asm/mips3.s
 		as -$$ABI -O -o $@ asm/mips3.s; \
 	else	$(CC) -c $(CFLAGS) -o $@ asm/mips3.s; fi
 
+bn-s390x.o:	asm/s390x.S
+	$(CC) $(CFLAGS) -c -o $@ asm/s390x.S
+
 x86_64-gcc.o:	asm/x86_64-gcc.c
 	$(CC) $(CFLAGS) -c -o $@ asm/x86_64-gcc.c
 x86_64-mont.s:	asm/x86_64-mont.pl