diff --git a/net-snmp-5.2.1-file_offset.patch b/net-snmp-5.2.1-file_offset.patch
new file mode 100644
index 0000000..977209f
--- /dev/null
+++ b/net-snmp-5.2.1-file_offset.patch
@@ -0,0 +1,44 @@
+--- net-snmp-5.2.1/include/net-snmp/agent/snmp_vars.h.long	2004-04-15 14:47:10.000000000 +0200
++++ net-snmp-5.2.1/include/net-snmp/agent/snmp_vars.h	2005-03-21 17:03:29.909271960 +0100
+@@ -73,7 +73,7 @@
+ 
+     struct nlist;
+ 
+-    extern long     long_return;
++    extern fsblkcnt_t long_return;
+     extern u_char   return_buf[];
+ 
+     extern oid      nullOid[];
+--- net-snmp-5.2.1/agent/mibgroup/host/hr_filesys.c.long	2004-06-19 15:34:11.000000000 +0200
++++ net-snmp-5.2.1/agent/mibgroup/host/hr_filesys.c	2005-03-21 17:03:29.910271808 +0100
+@@ -773,7 +773,7 @@
+     return 0;
+ }
+ 
+-long
++fsblkcnt_t
+ Get_FSSize(char *dev)
+ {
+     struct HRFS_statfs statfs_buf;
+--- net-snmp-5.2.1/agent/mibgroup/host/hr_filesys.h.long	2002-07-04 14:56:35.000000000 +0200
++++ net-snmp-5.2.1/agent/mibgroup/host/hr_filesys.h	2005-03-21 17:03:29.910271808 +0100
+@@ -12,7 +12,7 @@
+ extern int      Check_HR_FileSys_NFS(void);
+ 
+ extern int      Get_FSIndex(char *);
+-extern long     Get_FSSize(char *);     /* Temporary */
++extern fsblkcnt_t     Get_FSSize(char *);     /* Temporary */
+ 
+ 
+ #endif                          /* _MIBGROUP_HRFSYS_H */
+--- net-snmp-5.2.1/agent/snmp_vars.c.long	2005-03-21 17:08:37.790466904 +0100
++++ net-snmp-5.2.1/agent/snmp_vars.c	2005-03-21 17:08:37.790466904 +0100
+@@ -223,7 +223,7 @@
+  * int      name_len        IN - number of sub-ids in the name
+  */
+ 
+-long            long_return;
++fsblkcnt_t            long_return;
+ #ifndef ibm032
+ u_char          return_buf[258];
+ #else
diff --git a/net-snmp.spec b/net-snmp.spec
index 1469a64..194000e 100644
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@ -3,7 +3,7 @@
 Summary: A collection of SNMP protocol tools and libraries.
 Name: net-snmp
 Version: 5.2.1
-Release: 7
+Release: 8
 License: BSDish
 Group: System Environment/Daemons
 URL: http://net-snmp.sourceforge.net/
@@ -34,6 +34,7 @@ Patch15: net-snmp-5.2.1-trim.patch
 Patch16: net-snmp-5.1.2-ASN-unsigned64.patch
 Patch17: net-snmp-5.2.1-typeclash.diff
 Patch18: net-snmp-5.1.2-agentx_register_callbacks_entry.patch
+Patch19: net-snmp-5.2.1-file_offset.patch
 
 Prereq: /sbin/chkconfig
 Obsoletes: ucd-snmp
@@ -147,6 +148,7 @@ and applications.
 %patch16 -p1 -b .ASN-unsigned64
 %patch17 -b .typeclash
 %patch18 -p1 -b .reg_callbacks
+%patch19 -p1 -b .file_offset
 
 # Do this patch with a perl hack...
 perl -pi -e "s|'\\\$install_libdir'|'%{_libdir}'|" ltmain.sh
@@ -324,6 +326,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/*.la
 
 %changelog
+* Mon Apr 04 2005 Radek Vokal <rvokal@redhat.com> - 5.2.1-8
+- net-snmp properly deals with large partitions (#153101) <jryska@redhat.com>
+
 * Thu Mar 31 2005 Radek Vokal <rvokal@redhat.com> - 5.2.1-7
 - agentx double free error fix <jp.fujitsu>