diff --git a/net-snmp-config b/net-snmp-config
new file mode 100755
index 0000000..57fb9f9
--- /dev/null
+++ b/net-snmp-config
@@ -0,0 +1,47 @@
+#!/bin/sh
+#
+# net-snmp-config
+#
+# this shell script is designed to merely dump the configuration
+# information about how the net-snmp package was compiled.  The
+# information is particularily useful for applications that need to
+# link against the net-snmp libraries and hence must know about any
+# other libraries that must be linked in as well.
+
+# this particular shell script calls arch specific script to avoid
+# multilib conflicts
+
+# Supported arches ix86 ia64 ppc ppc64 s390 s390x x86_64
+
+arch=`arch`
+echo $arch | grep -q i.86
+if [ $? -eq 0 ] ; then
+    net-snmp-config-i386 $*
+    exit 0
+fi
+if [ "$arch" = "ia64" ] ; then
+    net-snmp-config-ia64 $*
+    exit 0
+fi
+if [ "$arch" = "ppc" ] ; then
+    net-snmp-config-ppc $*
+    exit 0
+fi
+if [ "$arch" = "ppc64" ] ; then
+    net-snmp-config-ppc64 $*
+    exit 0
+fi
+if [ "$arch" = "s390" ] ; then
+    net-snmp-config-s390 $*
+    exit 0
+fi
+if [ "$arch" = "s390x" ] ; then
+    net-snmp-config-s390x $*
+    exit 0
+fi
+if [ "$arch" = "x86_64" ] ; then
+    net-snmp-config-x86_64 $*
+    exit 0
+fi
+
+echo "Cannot determine architecture"
diff --git a/net-snmp-config.h b/net-snmp-config.h
index 66fe651..a260d51 100644
--- a/net-snmp-config.h
+++ b/net-snmp-config.h
@@ -24,7 +24,7 @@
 #elif defined(__x86_64__)
 #include "net-snmp-config-x86_64.h"
 #else
-#error "This net-snmp-devel package does not work your architecture?"
+#error "net-snmp-devel package does not work on your architecture"
 #endif
 
 #undef net-snmp-config_multilib_redirection_h
diff --git a/net-snmp.spec b/net-snmp.spec
index f0ce20e..00acf39 100644
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@ -6,7 +6,7 @@
 Summary: A collection of SNMP protocol tools and libraries.
 Name: net-snmp
 Version: 5.3.1.pre2
-Release: 2
+Release: 3
 
 License: BSDish
 Group: System Environment/Daemons
@@ -18,6 +18,7 @@ Source3: net-snmptrapd.init
 Source4: net-snmpd.logrotate
 Source5: ucd5820stat
 Source6: net-snmp-config.h
+Source7: net-snmp-config
 Patch1: ucd-snmp-4.2.4.pre3-mnttab.patch
 Patch2: net-snmp-5.0.6-syslog.patch
 Patch4: net-snmp-5.0.6-libtool.patch
@@ -196,9 +197,8 @@ basearch=%{_arch}
 basearch=i386
 %endif
 
-%ifnarch %{ix86}
 mv ${RPM_BUILD_ROOT}/%{_bindir}/net-snmp-config ${RPM_BUILD_ROOT}/%{_bindir}/net-snmp-config-${basearch}
-%endif
+install -m 755 %SOURCE7 ${RPM_BUILD_ROOT}/%{_bindir}/net-snmp-config
 
 %ifarch %{multilib_arches}
 # Do an net-snmp-config.h switcheroo to avoid file conflicts on systems where you
@@ -343,6 +343,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/*.a
 
 %changelog
+* Thu May 25 2006 Radek Vokal <rvokal@redhat.com> 5.3.1.pre2-3
+- another multilib fix. Fix also net-snmp-config script
+
 * Wed May 24 2006 Radek Vokal <rvokal@redhat.com> 5.3.1.pre2-2
 - another attempt to fix multilib issue. Generate dummy net-snmp-config.h file