diff --git a/.cvsignore b/.cvsignore
index c1971ad..7821262 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-net-snmp-5.3.tar.gz
+net-snmp-5.3.1.pre2.tar.gz
diff --git a/net-snmp-5.3.1-multilib.patch b/net-snmp-5.3.1-multilib.patch
new file mode 100644
index 0000000..33927d3
--- /dev/null
+++ b/net-snmp-5.3.1-multilib.patch
@@ -0,0 +1,20 @@
+--- net-snmp-5.3.1.pre2/man/read_config.3.def.old	2003-04-25 16:02:55.000000000 +0200
++++ net-snmp-5.3.1.pre2/man/read_config.3.def	2006-05-23 09:41:35.000000000 +0200
+@@ -257,7 +257,7 @@
+ .I SNMPCONFPATH
+ environment variable (or its default value, which will be
+ SYSCONFDIR/snmp, followed by
+-DATADIR/snmp, followed by LIBDIR/snmp, followed by $HOME/.snmp) and
++DATADIR/snmp, followed by /usr/lib/snmp (or /usr/lib64/snmp), followed by $HOME/.snmp) and
+ reading in the files found that match both the prefix registered and
+ the two suffixes
+ .I .conf
+@@ -285,7 +285,7 @@
+ SNMPCONFPATH
+ A colon separated list of directories to search for configuration
+ files in.
+-Default: SYSCONFDIR/snmp:DATADIR/snmp:LIBDIR/snmp:$HOME/.snmp
++Default: SYSCONFDIR/snmp:DATADIR/snmp:/usr/lib(64)/snmp:$HOME/.snmp
+ .SH "SEE ALSO"
+ .BR mib_api "(3), " snmp_api (3)
+ .\" Local Variables:
diff --git a/net-snmp.spec b/net-snmp.spec
index f35bda1..ba2575a 100644
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@ -2,8 +2,8 @@
 
 Summary: A collection of SNMP protocol tools and libraries.
 Name: net-snmp
-Version: 5.3
-Release: 8
+Version: 5.3.1.pre2
+Release: 1
 
 License: BSDish
 Group: System Environment/Daemons
@@ -21,22 +21,17 @@ Patch5: net-snmp-5.0.8-ipv6-sock-close.patch
 Patch6: net-snmp-5.0.8-readonly.patch
 Patch7: net-snmp-5.1-async-getnext.patch
 Patch8: net-snmp-5.1.1-pie.patch
-Patch9: net-snmp-5.2-64bit.diff
+Patch9: net-snmp-5.3.1-64bit.patch
 #kills virtual interfaces
 #Patch10: net-snmp-5.1.1-ipAdEntIfIndex.patch
 Patch12: net-snmp-5.1.2-dir-fix.patch
 Patch19: net-snmp-5.2.1-file_offset.patch
-Patch20: net-snmp-5.3-5.3.0.1.patch
 Patch21: net-snmp-5.3.0.1-maxsensors.patch
-Patch22: net-snmp-5.3-agent-registry-unregister-free.patch
 Patch23: net-snmp-5.3-proc_if_inet6.patch
 Patch24: net-snmp-5.3-size_t.patch
 Patch25: net-snmp-5.3-ipv6_retrans_ms.patch
 Patch26: net-snmp-5.3_vendorperl.patch
-Patch27: net-snmp-5.3-oid-names.patch
-Patch28: net-snmp-5.3-disman.patch
-Patch29: net-snmp-5.3-diskio.patch
-Patch30: net-snmp-5.3.0.1-ifnumber.patch
+Patch27: net-snmp-5.3.1-multilib.patch
 
 Prereq: /sbin/chkconfig
 Obsoletes: ucd-snmp
@@ -136,17 +131,13 @@ and applications.
 %patch9  -b .64bit
 %patch12 -p1 -b .dir-fix
 %patch19 -p1 -b .file_offset
-%patch20 -p1 -b .5.3.0.1
 %patch21 -p1 -b .maxsensors
-%patch22 -p0
+#%patch22 -p0
 %patch23 -p1 -b .proc_if
 %patch24 -p1 -b .size_t
 %patch25 -p1 -b .retrans_ms
 %patch26 -p0
-%patch27 -p0 -b .oid
-%patch28 -p1 -b .disman
-%patch29 -p1 -b .diskio
-%patch30 -p0 -b .ifnumbed
+%patch27 -p1 -b .multilib
 
 # Do this patch with a perl hack...
 perl -pi -e "s|'\\\$install_libdir'|'%{_libdir}'|" ltmain.sh
@@ -195,6 +186,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %makeinstall  ucdincludedir=${RPM_BUILD_ROOT}/usr/include/ucd-snmp
 
 # remove .la files
+%ifarch x86_64 s390x
+mv ${RPM_BUILD_ROOT}/%{_bindir}/net-snmp-config ${RPM_BUILD_ROOT}/%{_bindir}/net-snmp-config64
+mv ${RPM_BUILD_ROOT}/%{_includedir}/net-snmp-config.h ${RPM_BUILD_ROOT}/%{_includedir}/net-snmp-config64.h
+%endif
+
 rm  ${RPM_BUILD_ROOT}%{_libdir}/*.la
 
 install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/snmp
@@ -315,7 +311,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/lib*.so
 /usr/include/*
 %attr(0644,root,root)	%{_mandir}/man3/*.3.*
+%ifarch x86_64 s390x
+%attr(0755,root,root)	%{_bindir}/net-snmp-config64
+%else
 %attr(0755,root,root)	%{_bindir}/net-snmp-config
+%endif
 
 %files perl -f perl.lst
 %defattr(-,root,root)
@@ -329,6 +329,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/*.a
 
 %changelog
+* Tue May 23 2006 Radek Vokal <rvokal@redhat.com> 5.3.1.pre2-1
+- update to 5.3.1.pre2
+- fix multilib issues (#192736)
+  On system with /usr/lib64 use net-snmp-config64 and net-snmp-config64.h
+
 * Sat Apr 15 2006 Radek Vokál <rvokal@redhat.com> 5.3-8
 - fix missing IF-MIB::ifNumber.0 (#189007)
 
diff --git a/sources b/sources
index 8dd2db6..185ce07 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0dc8e4c8440c011139b71e59cd3b421a  net-snmp-5.3.tar.gz
+0930ce05346508de725613d4abbf8b04  net-snmp-5.3.1.pre2.tar.gz