diff --git a/quota-3.17-quotactlmanpage.patch b/quota-3.17-quotactlmanpage.patch
new file mode 100644
index 0000000..60c68b3
--- /dev/null
+++ b/quota-3.17-quotactlmanpage.patch
@@ -0,0 +1,90 @@
+diff -urNp quota-tools-orig/quotactl.2 quota-tools/quotactl.2
+--- quota-tools-orig/quotactl.2	2008-10-13 19:29:18.000000000 +0200
++++ quota-tools/quotactl.2	2009-09-18 09:27:30.000000000 +0200
+@@ -3,12 +3,11 @@
+ quotactl \- manipulate disk quotas
+ .SH SYNOPSIS
+ .nf
+-.B #include <linux/quota.h>
++.B #include <sys/quota.h>
++.B #include <sys/types.h>
+ .B #include <xfs/xqm.h>
+-.B #include <linux/dqblk_v1.h>
+-.B #include <linux/dqblk_v2.h>
+ .LP
+-.B long quotactl(int cmd, char \(**special, qid_t id, caddr_t addr)
++.B long quotactl(int cmd, char \(**special, int id, caddr_t addr)
+ .fi
+ .SH DESCRIPTION
+ .LP
+@@ -67,9 +66,9 @@ Get disk quota limits and current usage 
+ .IR id .
+ .I addr
+ is a pointer to an
+-.B if_dqblk
++.B dqblk
+ structure (defined in
+-.BR <linux/quota.h> ).
++.BR <sys/quota.h> ).
+ The field
+ .I dqb_valid
+ defines the entries in the structure which are set correctly. On
+@@ -82,15 +81,15 @@ Set current quota information for user o
+ .IR id .
+ .I addr
+ is a pointer to an
+-.B if_dqblk
++.B dqblk
+ structure (defined in
+-.BR <linux/quota.h> ).
++.BR <sys/quota.h> ).
+ The field
+ .I dqb_valid
+ defines which entries in the quota structure are valid and should be set. The constants for
+ .I dqb_valid
+ field are defined in the
+-.B <linux/quota.h>
++.B <sys/quota.h>
+ header file. This call obsoletes calls
+ .B Q_SETQLIM
+ and
+@@ -101,9 +100,9 @@ in the previous quota interfaces. This c
+ Get information (like grace times) about quotafile.
+ .I addr
+ should be a pointer to an
+-.B if_dqinfo
++.B dqinfo
+ structure (defined in
+-.IR <linux/quota.h> ).
++.IR <sys/quota.h> ).
+ The
+ .I dqi_valid
+ field in the structure defines entries in it
+@@ -118,15 +117,15 @@ is ignored. 
+ Set information about quotafile.
+ .I addr
+ should be a pointer to
+-.B if_dqinfo
++.B dqinfo
+ structure (defined in
+-.IR <linux/quota.h> ).
++.IR <sys/quota.h> ).
+ The field
+ .I dqi_valid
+ defines which entries in the quota info structure are valid and should be set. The constants for
+ .I dqi_valid
+ field are defined in the
+-.B <linux/quota.h>
++.B <sys/quota.h>
+ header file. This call obsoletes calls
+ .B Q_SETGRACE
+ and
+@@ -156,7 +155,7 @@ Get statistics and other generic informa
+ should be a pointer to
+ .B dqstats
+ structure (defined in
+-.BR <linux/quota.h> )
++.BR <sys/quota.h> )
+ in which data should be stored.
+ .I special
+ and
diff --git a/quota.spec b/quota.spec
index 65e7325..1e7d801 100644
--- a/quota.spec
+++ b/quota.spec
@@ -5,7 +5,7 @@ Name: quota
 Summary: System administration tools for monitoring users' disk usage
 Epoch: 1
 Version: 3.17
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: BSD and GPLv2+
 URL: http://sourceforge.net/projects/linuxquota/
 Group: System Environment/Base
@@ -22,6 +22,7 @@ Patch3: quota-3.06-pie.patch
 Patch4: quota-3.13-wrong-ports.patch
 Patch5: quota-3.16-helpoption.patch
 Patch6: quota-3.16-quotaoffhelp.patch
+Patch7: quota-3.17-quotactlmanpage.patch
 
 %description
 The quota package contains system administration tools for monitoring
@@ -51,6 +52,7 @@ on remote machines.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1 -b .usage
+%patch7 -p1 -b .quotactlman
 
 #fix typos/mistakes in localized documentation
 for pofile in $(find ./po/*.p*)
@@ -112,6 +114,9 @@ rm -rf %{buildroot}
 %attr(0644,root,root) %{_mandir}/man3/*
 
 %changelog
+* Fri Sep 18 2009 Ondrej Vasik <ovasik@redhat.com> 1:3.17-7
+- Fix headers and structs in quotactl manpage(#524138)
+
 * Fri Aug 28 2009 Ondrej Vasik <ovasik@redhat.com> 1:3.17-6
 - symlink manpage for rpc.rquotad