diff --git a/baselibs.conf b/baselibs.conf
index 304a5f4..b6a0d5e 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1,4 +1,4 @@
 libsnmp30
-arch ppc package net-snmp-devel
+net-snmp-devel
    requires -net-snmp-<targettype>
    requires "libsnmp30-<targettype> = <version>"
diff --git a/net-snmp-5.7.1-agentx-crash.patch b/net-snmp-5.7.1-agentx-crash.patch
new file mode 100644
index 0000000..0e7a203
--- /dev/null
+++ b/net-snmp-5.7.1-agentx-crash.patch
@@ -0,0 +1,23 @@
+Index: net-snmp-5.7.1.rc1/agent/mibgroup/agentx/master_admin.c
+===================================================================
+--- net-snmp-5.7.1.rc1.orig/agent/mibgroup/agentx/master_admin.c
++++ net-snmp-5.7.1.rc1/agent/mibgroup/agentx/master_admin.c
+@@ -135,11 +135,16 @@ close_agentx_session(netsnmp_session * s
+          * requests, so that the delegated request will be completed and
+          * further requests can be processed
+          */
+-        netsnmp_remove_delegated_requests_for_session(session);
++	while (netsnmp_remove_delegated_requests_for_session(session)) {
++		DEBUGMSGTL(("agentx/master", "Continue removing delegated requests\n"));
++	}
++
+         if (session->subsession != NULL) {
+             netsnmp_session *subsession = session->subsession;
+             for(; subsession; subsession = subsession->next) {
+-                netsnmp_remove_delegated_requests_for_session(subsession);
++                while (netsnmp_remove_delegated_requests_for_session(subsession)) {
++			DEBUGMSGTL(("agentx/master", "Continue removing delegated subsession requests\n"));
++		}
+             }
+         }
+                 
diff --git a/net-snmp-5.7.1.rc1.tar.bz2 b/net-snmp-5.7.1.rc1.tar.bz2
deleted file mode 100644
index daba78c..0000000
--- a/net-snmp-5.7.1.rc1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:697fca5463332adeb377f02e922d6ac82b4275b9d7f4eb9bea05d61702117916
-size 4378578
diff --git a/net-snmp-5.7.1.tar.bz2 b/net-snmp-5.7.1.tar.bz2
new file mode 100644
index 0000000..d0e9369
--- /dev/null
+++ b/net-snmp-5.7.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:36c61f5b7a950d1aa21da11a1371f91fd38596147a41170c7b529be924319d1f
+size 4382983
diff --git a/net-snmp.changes b/net-snmp.changes
index c40ed77..b10d4b7 100644
--- a/net-snmp.changes
+++ b/net-snmp.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Thu Sep 29 00:44:40 UTC 2011 - lchiquitto@suse.com
+
+- update to version 5.7.1: minor release including some bug fixes
+
+-------------------------------------------------------------------
+Fri Sep 16 17:24:39 UTC 2011 - jengelh@medozas.de
+
+- enable net-snmp-devel on all baselib architectures
+
+-------------------------------------------------------------------
+Wed Sep 14 18:33:18 UTC 2011 - lchiquitto@suse.com
+
+- make sure all delegated requests are removed before closing an
+  AgentX session (bnc#670789)
+
 -------------------------------------------------------------------
 Fri Sep  9 20:41:31 UTC 2011 - lchiquitto@suse.com
 
diff --git a/net-snmp.spec b/net-snmp.spec
index b925f62..ba68744 100644
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@ -45,7 +45,7 @@ Obsoletes:      net-snmp-64bit
 %endif
 #
 Url:            http://sourceforge.net/projects/net-snmp
-Source:         %{pkg_name}-%{version}.rc1.tar.bz2
+Source:         %{pkg_name}-%{version}.tar.bz2
 Source1:        rc.snmpd
 Source2:        snmpd.conf
 Source3:        README.SUSE
@@ -62,6 +62,7 @@ Patch5:         net-snmp-5.6.1-net-snmp-config-headercheck.patch
 Patch6:         net-snmp-5.5.0-perl-tk-warning.patch
 Patch7:         net-snmp-5.7.0-velocity-mib.patch
 Patch8:         net-snmp-5.7.0-recognize-reiserfs.patch
+Patch9:         net-snmp-5.7.1-agentx-crash.patch
 #
 Summary:        SNMP Daemon
 
@@ -195,7 +196,7 @@ Authors:
     G.S. Marzot <gmarzot@nortelnetworks.com>
 
 %prep
-%setup -q -n %{pkg_name}-%{version}.rc1
+%setup -q -n %{pkg_name}-%{version}
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -203,6 +204,7 @@ Authors:
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 MIBS="misc/ipfwacc ucd-snmp/diskio etherlike-mib rmon-mib velocity smux \