diff --git a/quota.changes b/quota.changes
index 2d49fcf..01ebcb9 100644
--- a/quota.changes
+++ b/quota.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jun 23 08:15:39 UTC 2010 - mseben@novell.com
+
+- quotactl.2 manual page was moved from quota to man-pages [bnc#587393]
+
 -------------------------------------------------------------------
 Tue Sep 22 09:17:57 CEST 2009 - mseben@novell.com
 
diff --git a/quota.spec b/quota.spec
index 414f423..b662eef 100644
--- a/quota.spec
+++ b/quota.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package quota (Version 3.17)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -21,11 +21,11 @@
 Name:           quota
 BuildRequires:  dbus-1-devel e2fsprogs-devel libnl-devel pkg-config tcpd-devel
 Version:        3.17
-Release:        2
+Release:        3
 PreReq:         %insserv_prereq %fillup_prereq
 AutoReqProv:    on
 Group:          System/Filesystems
-License:        GPL v2 only
+License:        GPLv2
 Url:            http://sourceforge.net/projects/linuxquota/
 Summary:        Disk Quota System
 Source:         %{name}-%{version}.tar.bz2
@@ -53,7 +53,7 @@ Authors:
     Jan Kara <jack@suse.cz>
 
 %package nfs
-License:        GPL v2 only
+License:        GPLv2
 Summary:        Disk Quota System on NFS
 Group:          System/Filesystems
 Requires:       quota = %version
@@ -99,6 +99,8 @@ make CC="gcc"
 install -d -m 755 ${RPM_BUILD_ROOT}/etc/init.d
 install -d -m 755 ${RPM_BUILD_ROOT}/sbin
 make install ROOTDIR=${RPM_BUILD_ROOT}
+#quotactl.2 manual page was moved from quota to man-pages[bnc#587393]
+rm ${RPM_BUILD_ROOT}/%{_mandir}/man?/quotactl.*
 mv ${RPM_BUILD_ROOT}%{_sbindir}/{quotacheck,quotaon,quotaoff} ${RPM_BUILD_ROOT}/sbin/
 #installing ldap-scripts
 install -m 755 ldap-scripts/*pl ${RPM_BUILD_ROOT}/usr/sbin/