diff --git a/net-snmp-5.6.0-net-snmp-config-headercheck.patch b/net-snmp-5.6.1-net-snmp-config-headercheck.patch
similarity index 77%
rename from net-snmp-5.6.0-net-snmp-config-headercheck.patch
rename to net-snmp-5.6.1-net-snmp-config-headercheck.patch
index 82579bc..23fbd90 100644
--- a/net-snmp-5.6.0-net-snmp-config-headercheck.patch
+++ b/net-snmp-5.6.1-net-snmp-config-headercheck.patch
@@ -1,7 +1,7 @@
-Index: net-snmp-5.6/net-snmp-config.in
+Index: net-snmp-5.6.1/net-snmp-config.in
 ===================================================================
---- net-snmp-5.6.orig/net-snmp-config.in
-+++ net-snmp-5.6/net-snmp-config.in
+--- net-snmp-5.6.1.orig/net-snmp-config.in
++++ net-snmp-5.6.1/net-snmp-config.in
 @@ -41,6 +41,14 @@ count()
      echo $#
  }
@@ -17,7 +17,7 @@ Index: net-snmp-5.6/net-snmp-config.in
  prefix=@prefix@
  exec_prefix=@exec_prefix@
  includedir=@includedir@
-@@ -127,9 +135,11 @@ else
+@@ -138,9 +146,11 @@ else
        ;;
      #################################################### compile
      --base-cflags)
@@ -29,7 +29,7 @@ Index: net-snmp-5.6/net-snmp-config.in
        echo @CFLAGS@ @DEVFLAGS@ @CPPFLAGS@ -I. -I${NSC_INCLUDEDIR}
        ;;
      --srcdir)
-@@ -140,6 +150,7 @@ else
+@@ -151,6 +161,7 @@ else
        echo $NSC_LIBDIR
        ;;
      --ldflags|--ld*)
@@ -37,34 +37,34 @@ Index: net-snmp-5.6/net-snmp-config.in
        echo $NSC_LDFLAGS
        ;;
      --build-lib-dirs)
-@@ -177,29 +188,37 @@ else
+@@ -188,29 +199,37 @@ else
      #################################################### client lib
      --libs)
        # use this one == --netsnmp-libs + --external-libs
 +      check_devel_files
-       echo $NSC_LDFLAGS $NSC_LIBDIR -lnetsnmp $NSC_LIBS $NSC_LNETSNMPLIBS
+       echo $NSC_LDFLAGS $NSC_LIBDIR $NSC_SNMPLIBS $NSC_LIBS
        ;;
      --netsnmp-libs)
 +      check_devel_files
-       echo $NSC_LIBDIR -lnetsnmp
+       echo $NSC_LIBDIR $NSC_BASE_SNMP_LIBS
        ;;
      --external-libs)
 +      check_devel_files
-       echo $NSC_LDFLAGS $NSC_LIBS $NSC_LNETSNMPLIBS
+       echo $NSC_LDFLAGS $NSC_LNETSNMPLIBS $NSC_LIBS
        ;;
      #################################################### agent lib
      --base-agent-libs)
 +      check_devel_files
-       echo $NSC_BASE_AGENT_LIBS $NSC_LNETSNMPLIBS
+       echo $NSC_BASE_AGENT_LIBS
        ;;
      --base-subagent-libs)
 +      check_devel_files
        echo $NSC_BASE_SUBAGENT_LIBS
        ;;
      --agent-libs)
-+      check_devel_files
        # use this one == --netsnmp-agent-libs + --external-libs
-       echo $NSC_LDFLAGS $NSC_LIBDIR $NSC_BASE_AGENT_LIBS $NSC_AGENTLIBS
++      check_devel_files
+       echo $NSC_LDFLAGS $NSC_LIBDIR $NSC_AGENTLIBS $NSC_LIBS
        ;;
      --netsnmp-agent-libs)
 +      check_devel_files
@@ -72,10 +72,10 @@ Index: net-snmp-5.6/net-snmp-config.in
        ;;
      --external-agent-libs)
 +      check_devel_files
-       echo $NSC_LDFLAGS $NSC_AGENTLIBS
+       echo $NSC_LDFLAGS $NSC_LMIBLIBS $NSC_LAGENTLIBS $NSC_LNETSNMPLIBS $NSC_LIBS
        ;;
      ####################################################
-@@ -225,6 +244,7 @@ else
+@@ -236,6 +255,7 @@ else
  
      ####################################################
      --compile-subagent)
diff --git a/net-snmp-5.6.1-recognize-jfs-and-xfs.patch b/net-snmp-5.6.1-recognize-jfs-and-xfs.patch
new file mode 100644
index 0000000..948d909
--- /dev/null
+++ b/net-snmp-5.6.1-recognize-jfs-and-xfs.patch
@@ -0,0 +1,30 @@
+Index: net-snmp-5.6.1/agent/mibgroup/hardware/fsys/mnttypes.h
+===================================================================
+--- net-snmp-5.6.1.orig/agent/mibgroup/hardware/fsys/mnttypes.h
++++ net-snmp-5.6.1/agent/mibgroup/hardware/fsys/mnttypes.h
+@@ -156,5 +156,12 @@
+ #ifndef MNTTYPE_RPCPIPE
+ #define MNTTYPE_RPCPIPE  "rpc_pipefs"
+ #endif
++#ifndef MNTTYPE_XFS
++#define MNTTYPE_XFS      "xfs"
++#endif
++#ifndef MNTTYPE_JFS
++#define MNTTYPE_JFS      "jfs"
++#endif
++
+ 
+ #endif /* _NETSNMP_FSYS_MNTTYPES_H */
+Index: net-snmp-5.6.1/agent/mibgroup/hardware/fsys/fsys_mntent.c
+===================================================================
+--- net-snmp-5.6.1.orig/agent/mibgroup/hardware/fsys/fsys_mntent.c
++++ net-snmp-5.6.1/agent/mibgroup/hardware/fsys/fsys_mntent.c
+@@ -133,6 +133,8 @@ _fsys_type( char *typename )
+               !strcmp(typename, MNTTYPE_TMPFS) ||
+               !strcmp(typename, MNTTYPE_GFS) ||
+               !strcmp(typename, MNTTYPE_GFS2) ||
++              !strcmp(typename, MNTTYPE_XFS) ||
++              !strcmp(typename, MNTTYPE_JFS) ||
+               !strcmp(typename, MNTTYPE_LOFS))
+        return NETSNMP_FS_TYPE_OTHER;
+ 
diff --git a/net-snmp-5.6.1-upstream-20110104.patch.bz2 b/net-snmp-5.6.1-upstream-20110104.patch.bz2
deleted file mode 100644
index ba9ea52..0000000
--- a/net-snmp-5.6.1-upstream-20110104.patch.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:09fd65b550cc3c4623fce66fc1cb2729571a105c3dd8c0e229413e114b61a501
-size 815
diff --git a/net-snmp-5.6.1-upstream-20110328.patch.bz2 b/net-snmp-5.6.1-upstream-20110328.patch.bz2
new file mode 100644
index 0000000..9aa473b
--- /dev/null
+++ b/net-snmp-5.6.1-upstream-20110328.patch.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:57572f0be8898ad3b849c2be90470e4cf3ea65a8497fc9ebd2491b32ea84e4a7
+size 165885
diff --git a/net-snmp.changes b/net-snmp.changes
index e56e75a..80c03ad 100644
--- a/net-snmp.changes
+++ b/net-snmp.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Apr 13 17:30:28 UTC 2011 - lchiquitto@novell.com
+
+- add JFS and XFS to the list of known file systems (bnc#687327)
+
+-------------------------------------------------------------------
+Mon Mar 28 18:53:16 UTC 2011 - lchiquitto@novell.com
+
+- update upstream patches from branch V5-6-patches to 20110328
+
 -------------------------------------------------------------------
 Tue Jan  4 11:34:19 UTC 2011 - lchiquitto@novell.com
 
diff --git a/net-snmp.spec b/net-snmp.spec
index c14bf9c..0291f0f 100644
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@ -55,15 +55,16 @@ Source6:        test_installed
 Source7:        net-snmp.sysconfig
 Source8:        net-snmp-rpmlintrc
 Source9:        baselibs.conf
-Patch0:         net-snmp-5.6.1-upstream-20110104.patch.bz2
+Patch0:         net-snmp-5.6.1-upstream-20110328.patch.bz2
 # unused patch atm
 Patch1:         net-snmp-5.5.0-socket-path.patch
 Patch2:         net-snmp-5.5.0-testing-empty-arptable.patch
 Patch3:         net-snmp-5.6.0-pie.patch
-Patch5:         net-snmp-5.6.0-net-snmp-config-headercheck.patch
+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.5.0-velocity-mib.patch
 Patch9:         net-snmp-5.6.0-enable-hrh-filesys.patch
+Patch10:        net-snmp-5.6.1-recognize-jfs-and-xfs.patch
 #
 Summary:        SNMP Daemon
 
@@ -206,6 +207,7 @@ Authors:
 %patch6 -p1
 %patch7 -p1
 %patch9 -p1
+%patch10 -p1
 
 %build
 MIBS="misc/ipfwacc ucd-snmp/diskio etherlike-mib rmon-mib velocity smux \