diff --git a/net-snmp-5.5-perl-linking.patch b/net-snmp-5.5-perl-linking.patch
new file mode 100644
index 0000000..cbf36af
--- /dev/null
+++ b/net-snmp-5.5-perl-linking.patch
@@ -0,0 +1,16 @@
+554747 - net-snmp-config should not contain perl options
+
+Remove rpath from net-snmp-config --agent-libs output.
+
+diff -up net-snmp-5.5/net-snmp-config.in.jsaf net-snmp-5.5/net-snmp-config.in
+--- net-snmp-5.5/net-snmp-config.in.jsaf	2009-04-04 12:07:39.000000000 +0200
++++ net-snmp-5.5/net-snmp-config.in	2010-08-19 16:08:28.825276858 +0200
+@@ -50,7 +50,7 @@ NSC_LDFLAGS="@LDFLAGS@"
+ NSC_INCLUDEDIR=${includedir}
+ NSC_LIBDIR=-L${libdir}
+ NSC_LIBS="@LIBS@"
+-NSC_AGENTLIBS="@AGENTLIBS@ @PERLLDOPTS_FOR_APPS@"
++NSC_AGENTLIBS="@AGENTLIBS@"
+ NSC_PREFIX=$prefix
+ NSC_EXEC_PREFIX=$exec_prefix
+ NSC_SRCDIR=@srcdir@
diff --git a/net-snmp.spec b/net-snmp.spec
index 59d7458..f608f9c 100644
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@ -11,7 +11,7 @@
 Summary: A collection of SNMP protocol tools and libraries
 Name: net-snmp
 Version: 5.5
-Release: 19%{?dist}
+Release: 20%{?dist}
 Epoch: 1
 
 License: BSD
@@ -37,6 +37,7 @@ Patch8: net-snmp-5.5-test-tmpdir.patch
 Patch9: net-snmp-5.5-include-struct.patch
 Patch10: net-snmp-5.5-mktemp-size.patch
 Patch11: net-snmp-5.5-apsl-copying.patch
+Patch12: net-snmp-5.5-perl-linking.patch
 
 Requires(post): chkconfig
 Requires(preun): chkconfig
@@ -172,6 +173,7 @@ Net-SNMP toolkit library.
 %patch9 -p1 -b .include-struct
 %patch10 -p1 -b .mktemp-size
 %patch11 -p1 -b .apsl
+%patch12 -p1 -b .perl-linking
 
 %build
 MIBS="host agentx smux \
@@ -420,6 +422,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_datadir}/snmp/mibs/*
 
 %changelog
+* Thu Aug 19 2010 Jan Safranek <jsafrane@redhat.com> - 1:5.5-20
+- Remove rpath from net-snmp-config output (#554747)
+
 * Wed Aug  4 2010 Jan Safranek <jsafrane@redhat.com> - 1:5.5-19
 - Add APSL 2.0 license to COPYING file