diff --git a/net-snmp.spec b/net-snmp.spec
index 9774203..796ec8c 100644
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@ -6,8 +6,9 @@
 
 Summary: A collection of SNMP protocol tools and libraries.
 Name: net-snmp
-Version: %{major_ver}.0
-Release: 6%{?dist}
+Version: %{major_ver}
+Release: 7%{?dist}
+Epoch: 1
 
 License: BSDish
 Group: System Environment/Daemons
@@ -40,7 +41,7 @@ Patch27: net-snmp-5.3.1-multilib.patch
 Patch28: net-snmp-5.3.1-retrans_time.patch
 Patch29: net-snmp-5.3.1-config_libdir.patch
 Patch30: net-snmp-5.3.1-lm_sensors.patch
-Patch31: net-snmp-5.3.1-byteorder.patch
+Patch31: net-snmp-5.3.1-tcp-udp-mib-byteorder.patch
 
 Prereq: /sbin/chkconfig
 Obsoletes: ucd-snmp
@@ -76,7 +77,7 @@ Building option:
 %package utils
 Group: Applications/System
 Summary: Network management utilities using SNMP, from the NET-SNMP project.
-Requires: %{name} = %{version}
+Requires: %{name} = %{epoch}:%{version}
 Obsoletes: ucd-snmp-utils
 
 %description utils
@@ -90,7 +91,7 @@ package.
 %package devel
 Group: Development/Libraries
 Summary: The development environment for the NET-SNMP project.
-Requires: %{name} = %{version}
+Requires: %{name} = %{epoch}:%{version}
 Obsoletes: ucd-snmp-devel
 Requires: beecrypt-devel, elfutils-devel, rpm-devel, elfutils-libelf-devel
 
@@ -107,7 +108,7 @@ packages installed.
 %package perl
 Group: Development/Libraries
 Summary: The perl NET-SNMP module and the mib2c tool.
-Requires: %{name} = %{version}, perl >= 5
+Requires: %{name} = %{epoch}:%{version}, perl >= 5
 BuildRequires: perl >= 5
 
 %description perl
@@ -147,7 +148,7 @@ and applications.
 %patch28 -p0 -b .retrans_ms
 %patch29 -p1 -b .libdir
 %patch30 -p1 -b .lm_sensors
-%patch31 -p1 -b .byteorder
+%patch31 -p0 -b .byteorder
 
 # Do this patch with a perl hack...
 perl -pi -e "s|'\\\$install_libdir'|'%{_libdir}'|" ltmain.sh
@@ -350,6 +351,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/lib*.so.*
 
 %changelog
+* Tue Sep  5 2006 Radek Vokal <rvokal@redhat.com> 5.3.1-7
+- better upstream patch for byteorder
+- add epoch to corespond with upstream versioning 
+
 * Wed Aug 30 2006 Radek Vokal <rvokal@redhat.com> 5.3.1.0-6
 - fix IPv4/IPv6 address presentation (#200255)