diff --git a/openldap.spec b/openldap.spec
index c62f75c..b01528d 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -3,7 +3,7 @@
 Summary: The configuration files, libraries and documentation for OpenLDAP.
 Name: openldap
 Version: 2.0.7
-Release: 14
+Release: 14a
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz
@@ -105,6 +105,15 @@ autoheader
 autoconf
 
 %build
+# like libtoolize, but different
+%ifarch s390 s390x
+for file in config.sub config.guess ; do
+  for place in `find . -type f -name $file` ; do
+     cp -f /usr/share/libtool/$file $place
+  done
+done
+%endif
+
 CPPFLAGS="-I/usr/kerberos/include"; export CPPFLAGS
 CFLAGS="$CPPFLAGS $RPM_OPT_FLAGS -D_REENTRANT -fPIC"; export CFLAGS
 LDFLAGS="-L/usr/kerberos/lib"; export LDFLAGS
@@ -270,6 +279,9 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/*
 
 %changelog
+* Fri Feb  8 2002 Phil Knirsch <pknirsch@redhat.com>
+- Config.guess/status fix for s390(x)
+
 * Fri Mar  2 2001 Nalin Dahyabhai <nalin@redhat.com>
 - rebuild in new environment