diff --git a/.cvsignore b/.cvsignore
index d7eb695..00829a0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-quota-3.16.tar.gz
+quota-3.17.tar.gz
diff --git a/quota-3.06-no-stripping.patch b/quota-3.06-no-stripping.patch
index db490fa..e773955 100644
--- a/quota-3.06-no-stripping.patch
+++ b/quota-3.06-no-stripping.patch
@@ -24,7 +24,7 @@
  	edquota repquota warnquota quotastats setquota quot xqmstats \
  	convertquota $(ROOTDIR)$(sbindir)
  	-mkdir -p $(ROOTDIR)$(sysconfdir)
-@@ -90,8 +90,8 @@
+@@ -90,11 +90,11 @@
  	-mkdir -p $(ROOTDIR)$(mandir)/man8
  	-$(INSTALL) -m 755 -d $(ROOTDIR)$(includedir)/rpcsvc
  	-$(INSTALL) -m 644 rquota.h rquota.x $(ROOTDIR)$(includedir)/rpcsvc
@@ -32,6 +32,10 @@
 -	-$(INSTALL) $(STRIP) -m $(DEF_SBIN_MODE) rpc.rquotad $(ROOTDIR)$(sbindir)
 +	-$(INSTALL) -m $(DEF_SBIN_MODE) quota $(ROOTDIR)$(bindir)
 +	-$(INSTALL) -m $(DEF_SBIN_MODE) rpc.rquotad $(ROOTDIR)$(sbindir)
+ ifneq ($(NETLINKLIBS),)
+-	-$(INSTALL) $(STRIP) -m $(DEF_SBIN_MODE) quota_nld $(ROOTDIR)$(sbindir)
++	-$(INSTALL) -m $(DEF_SBIN_MODE) quota_nld $(ROOTDIR)$(sbindir)
+ endif
  	-$(INSTALL) -m $(DEF_MAN_MODE) *.1 $(ROOTDIR)$(mandir)/man1
  	-$(INSTALL) -m $(DEF_MAN_MODE) *.2 $(ROOTDIR)$(mandir)/man2
  	-$(INSTALL) -m $(DEF_MAN_MODE) *.3 $(ROOTDIR)$(mandir)/man3
diff --git a/quota-3.16-ext4support.patch b/quota-3.16-ext4support.patch
deleted file mode 100644
index d8125a7..0000000
--- a/quota-3.16-ext4support.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -urNp quota-tools-orig/mntopt.h quota-tools/mntopt.h
---- quota-tools-orig/mntopt.h	2007-08-22 13:26:55.000000000 +0200
-+++ quota-tools/mntopt.h	2008-10-30 09:13:35.000000000 +0100
-@@ -6,7 +6,8 @@
- /* filesystem type */
- #define MNTTYPE_EXT2		"ext2"	/* 2nd Extended file system */
- #define MNTTYPE_EXT3		"ext3"	/* ext2 + journaling */
--#define MNTTYPE_EXT4		"ext4dev"	/* ext4 filesystem */
-+#define MNTTYPE_EXT4		"ext4"	/* ext4 filesystem */
-+#define MNTTYPE_EXT4DEV "ext4dev" /* ext4dev filesystem */
- #define MNTTYPE_MINIX		"minix"	/* MINIX file system */
- #define MNTTYPE_UFS		"ufs"	/* UNIX file system */
- #define MNTTYPE_UDF		"udf"	/* OSTA UDF file system */
-diff -urNp quota-tools-orig/quotacheck.c quota-tools/quotacheck.c
---- quota-tools-orig/quotacheck.c	2008-10-30 09:11:13.000000000 +0100
-+++ quota-tools/quotacheck.c	2008-10-30 09:14:20.000000000 +0100
-@@ -1077,6 +1077,7 @@ static void check_all(void)
- 		    !hasmntopt(mnt, MNTOPT_GRPJQUOTA) && !warned &&
- 		    (!strcmp(mnt->mnt_type, MNTTYPE_EXT3) ||
- 		     !strcmp(mnt->mnt_type, MNTTYPE_EXT4) ||
-+         !strcmp(mnt->mnt_type, MNTTYPE_EXT4DEV) ||
- 		     !strcmp(mnt->mnt_type, MNTTYPE_REISER))) {
- 			struct utsname stats;
- 
-diff -urNp quota-tools-orig/quotasys.c quota-tools/quotasys.c
---- quota-tools-orig/quotasys.c	2008-10-30 09:11:12.000000000 +0100
-+++ quota-tools/quotasys.c	2008-10-30 09:14:49.000000000 +0100
-@@ -63,6 +63,7 @@ static int correct_fstype(char *type)
- 		if (!strcmp(type, MNTTYPE_EXT2) ||
- 		    !strcmp(type, MNTTYPE_EXT3) ||
- 		    !strcmp(type, MNTTYPE_EXT4) ||
-+        !strcmp(type, MNTTYPE_EXT4DEV) ||
- 		    !strcmp(type, MNTTYPE_JFS) ||
- 		    !strcmp(type, MNTTYPE_MINIX) ||
- 		    !strcmp(type, MNTTYPE_UFS) ||
diff --git a/quota-3.16-formatstring.patch b/quota-3.16-formatstring.patch
deleted file mode 100644
index 910d11a..0000000
--- a/quota-3.16-formatstring.patch
+++ /dev/null
@@ -1,301 +0,0 @@
-diff -urNp quota-tools-orig/edquota.c quota-tools/edquota.c
---- quota-tools-orig/edquota.c	2007-09-18 18:21:07.000000000 +0200
-+++ quota-tools/edquota.c	2008-06-19 16:00:13.000000000 +0200
-@@ -181,7 +181,7 @@ int parse_options(int argc, char **argv)
- 	if (((flags & FL_EDIT_PERIOD) && argc != 0) || ((flags & FL_EDIT_TIMES) && argc < 1))
- 		usage();
- 	if ((flags & (FL_EDIT_PERIOD | FL_EDIT_TIMES)) && protoname) {
--		errstr(_("Prototype name does not make sence when editting grace period or times.\n"));
-+		errstr(_("Prototype name does not make sence when editing grace period or times.\n"));
- 		usage();
- 	}
- 	return optind;
-@@ -196,8 +196,11 @@ void copy_prototype(int argc, char **arg
- 	protoid = name2id(protoname, quotatype, !!(flags & FL_NUMNAMES), NULL);
- 	protoprivs = getprivs(protoid, handles, 0);
- 	while (argc-- > 0) {
--		id = name2id(*argv++, quotatype, !!(flags & FL_NUMNAMES), NULL);
-+		id = name2id(*argv, quotatype, !!(flags & FL_NUMNAMES), NULL);
- 		curprivs = getprivs(id, handles, 0);
-+		if (!curprivs)
-+			die(1, _("Cannot get quota information for user %s\n"), *argv);
-+		argv++;
- 
- 		for (pprivs = protoprivs, cprivs = curprivs; pprivs && cprivs;
- 		     pprivs = pprivs->dq_next, cprivs = cprivs->dq_next) {
-@@ -276,7 +279,7 @@ int main(int argc, char **argv)
- 			ret = -1;
- 		}
- 		if (editprivs(tmpfil) < 0) {
--			errstr(_("Error while editting grace times.\n"));
-+			errstr(_("Error while editing grace times.\n"));
- 			ret = -1;
- 		}
- 		if (readtimes(handles, tmpfd) < 0) {
-@@ -288,13 +291,15 @@ int main(int argc, char **argv)
- 		for (; argc > 0; argc--, argv++) {
- 			id = name2id(*argv, quotatype, !!(flags & FL_NUMNAMES), NULL);
- 			curprivs = getprivs(id, handles, 0);
-+			if (!curprivs)
-+				die(1, _("Cannot get quota information for user %s\n"), *argv);
- 			if (writeindividualtimes(curprivs, tmpfd, *argv, quotatype) < 0) {
- 				errstr(_("Cannot write individual grace times to file.\n"));
- 				ret = -1;
- 				continue;
- 			}
- 			if (editprivs(tmpfil) < 0) {
--				errstr(_("Error while editting individual grace times.\n"));
-+				errstr(_("Error while editing individual grace times.\n"));
- 				ret = -1;
- 				continue;
- 			}
-@@ -312,13 +317,15 @@ int main(int argc, char **argv)
- 		for (; argc > 0; argc--, argv++) {
- 			id = name2id(*argv, quotatype, !!(flags & FL_NUMNAMES), NULL);
- 			curprivs = getprivs(id, handles, 0);
-+			if (!curprivs)
-+      	die(1, _("Cannot get quota information for user %s.\n"), *argv);
- 			if (writeprivs(curprivs, tmpfd, *argv, quotatype) < 0) {
- 				errstr(_("Cannot write quotas to file.\n"));
- 				ret = -1;
- 				continue;
- 			}
- 			if (editprivs(tmpfil) < 0) {
--				errstr(_("Error while editting quotas.\n"));
-+				errstr(_("Error while editing quotas.\n"));
- 				ret = -1;
- 				continue;
- 			}
-diff -urNp quota-tools-orig/Makefile.in quota-tools/Makefile.in
---- quota-tools-orig/Makefile.in	2008-06-19 15:31:35.000000000 +0200
-+++ quota-tools/Makefile.in	2008-06-19 15:35:05.000000000 +0200
-@@ -105,6 +105,9 @@ install: all @INSTMO@
- 	-$(INSTALL) -m 644 rquota.h rquota.x $(ROOTDIR)$(includedir)/rpcsvc
- 	-$(INSTALL) -m $(DEF_SBIN_MODE) quota $(ROOTDIR)$(bindir)
- 	-$(INSTALL) -m $(DEF_SBIN_MODE) rpc.rquotad $(ROOTDIR)$(sbindir)
-+ifneq ($(NETLINKLIBS),)
-+  -$(INSTALL) -m $(DEF_SBIN_MODE) quota_nld $(ROOTDIR)$(sbindir)
-+endif
- 	-$(INSTALL) -m $(DEF_MAN_MODE) *.1 $(ROOTDIR)$(mandir)/man1
- 	-$(INSTALL) -m $(DEF_MAN_MODE) *.2 $(ROOTDIR)$(mandir)/man2
- 	-$(INSTALL) -m $(DEF_MAN_MODE) *.3 $(ROOTDIR)$(mandir)/man3
-diff -urNp quota-tools-orig/quota.c quota-tools/quota.c
---- quota-tools-orig/quota.c	2007-09-18 18:21:07.000000000 +0200
-+++ quota-tools/quota.c	2008-06-19 15:42:12.000000000 +0200
-@@ -204,7 +204,7 @@ int showquotas(int type, qid_t id, int m
- 			}
- 			else {
- 				if (bover)
--					sprintf(timebuf, "%Lu", (long long unsigned int)q->dq_dqb.dqb_btime);
-+					sprintf(timebuf, "%llu", (long long unsigned int)q->dq_dqb.dqb_btime);
- 				else
- 					strcpy(timebuf, "0");
- 			}
-@@ -222,7 +222,7 @@ int showquotas(int type, qid_t id, int m
- 			}
- 			else {
- 				if (iover)
--					sprintf(timebuf, "%Lu", (long long unsigned int)q->dq_dqb.dqb_itime);
-+					sprintf(timebuf, "%llu", (long long unsigned int)q->dq_dqb.dqb_itime);
- 				else
- 					strcpy(timebuf, "0");
- 			}
-diff -urNp quota-tools-orig/quotacheck.c quota-tools/quotacheck.c
---- quota-tools-orig/quotacheck.c	2008-03-13 15:49:33.000000000 +0100
-+++ quota-tools/quotacheck.c	2008-06-19 15:51:40.000000000 +0200
-@@ -554,7 +554,7 @@ static int scan_dir(char *pathname)
- 			if (gcheck)
- 				add_to_quota(GRPQUOTA, st.st_ino, st.st_uid, st.st_gid, st.st_mode,
- 					     st.st_nlink, qspace, 1);
--			debug(FL_DEBUG, _("\tAdding %s size %Ld ino %d links %d uid %u gid %u\n"), de->d_name,
-+			debug(FL_DEBUG, _("\tAdding %s size %lld ino %d links %d uid %u gid %u\n"), de->d_name,
- 			      (long long)st.st_size, (int)st.st_ino, (int)st.st_nlink, (int)st.st_uid, (int)st.st_gid);
- 			files_done++;
- 		}
-diff -urNp quota-tools-orig/quotacheck_v2.c quota-tools/quotacheck_v2.c
---- quota-tools-orig/quotacheck_v2.c	2007-02-20 12:51:59.000000000 +0100
-+++ quota-tools/quotacheck_v2.c	2008-06-19 15:43:53.000000000 +0200
-@@ -158,7 +158,7 @@ static int buffer_entry(dqbuf_t buf, uin
- 			if (flags & FL_GUESSDQ) {
- 				if (!(flags & (FL_DEBUG | FL_VERBOSE)))
- 					fputc('\n', stderr);
--				errstr(_("Found more structures for ID %u. Using values: BHARD: %Ld BSOFT: %Ld IHARD: %Ld ISOFT: %Ld\n"),
-+				errstr(_("Found more structures for ID %u. Using values: BHARD: %lld BSOFT: %lld IHARD: %lld ISOFT: %lld\n"),
- 					(uint) id, (long long)fdq->dqb_bhardlimit, (long long)fdq->dqb_bsoftlimit,
- 					(long long)fdq->dqb_ihardlimit, (long long)fdq->dqb_isoftlimit);
- 				return 0;
-@@ -166,7 +166,7 @@ static int buffer_entry(dqbuf_t buf, uin
- 			else if (flags & FL_INTERACTIVE) {
- 				if (!(flags & (FL_DEBUG | FL_VERBOSE)))
- 					fputc('\n', stderr);
--				errstr(_("Found more structures for ID %u. Values: BHARD: %Ld/%Ld BSOFT: %Ld/%Ld IHARD: %Ld/%Ld ISOFT: %Ld/%Ld\n"),
-+				errstr(_("Found more structures for ID %u. Values: BHARD: %lld/%lld BSOFT: %lld/%lld IHARD: %lld/%lld ISOFT: %lld/%lld\n"),
- 					(uint) id, (long long)fdq->dqb_bhardlimit, (long long)mdq.dqb_bhardlimit,
- 					(long long)fdq->dqb_bsoftlimit, (long long)mdq.dqb_bsoftlimit,
- 					(long long)fdq->dqb_ihardlimit, (long long)mdq.dqb_ihardlimit,
-diff -urNp quota-tools-orig/quotaio_xfs.c quota-tools/quotaio_xfs.c
---- quota-tools-orig/quotaio_xfs.c	2001-09-27 23:34:58.000000000 +0200
-+++ quota-tools/quotaio_xfs.c	2008-06-19 15:49:35.000000000 +0200
-@@ -274,7 +274,7 @@ static int xfs_report(struct quota_handl
- 		if (info->qs_uquota.qfs_ino == -1 || info->qs_uquota.qfs_ino == 0)
- 			printf(_("Inode: none\n"));
- 		else
--			printf(_("Inode: #%Lu (%Lu blocks, %u extents)\n"),
-+			printf(_("Inode: #%llu (%llu blocks, %u extents)\n"),
- 			       (unsigned long long)info->qs_uquota.qfs_ino,
- 			       (unsigned long long)info->qs_uquota.qfs_nblks,
- 			       info->qs_uquota.qfs_nextents);
-@@ -283,7 +283,7 @@ static int xfs_report(struct quota_handl
- 		if (info->qs_gquota.qfs_ino == -1)
- 			printf(_("Inode: none\n"));
- 		else
--			printf(_("Inode: #%Lu (%Lu blocks, %u extents)\n"),
-+			printf(_("Inode: #%llu (%llu blocks, %u extents)\n"),
- 			       (unsigned long long)info->qs_gquota.qfs_ino,
- 			       (unsigned long long)info->qs_gquota.qfs_nblks,
- 			       info->qs_gquota.qfs_nextents);
-diff -urNp quota-tools-orig/quota_nld.c quota-tools/quota_nld.c
---- quota-tools-orig/quota_nld.c	2008-01-17 20:06:22.000000000 +0100
-+++ quota-tools/quota_nld.c	2008-06-19 15:51:05.000000000 +0200
-@@ -22,6 +22,7 @@
- #include <errno.h>
- #include <string.h>
- #include <fcntl.h>
-+#include <limits.h>
- 
- #include <netlink/genl/genl.h>
- #include <netlink/genl/ctrl.h>
-@@ -250,12 +251,12 @@ static void write_console_warning(struct
- 		}
- 	}
- 	if (!max_atime) {
--		errstr(_("Failed to find tty of user %Lu to report warning to.\n"), (unsigned long long)warn->caused_id);
-+		errstr(_("Failed to find tty of user %llu to report warning to.\n"), (unsigned long long)warn->caused_id);
- 		return;
- 	}
- 	fd = open(max_dev, O_WRONLY);
- 	if (fd < 0) {
--		errstr(_("Failed to open tty %s of user %Lu to report warning.\n"), dev, (unsigned long long)warn->caused_id);
-+		errstr(_("Failed to open tty %s of user %llu to report warning.\n"), dev, (unsigned long long)warn->caused_id);
- 		return;
- 	}
- 	id2name(warn->excess_id, warn->qtype, user);
-@@ -287,7 +288,7 @@ static void write_console_warning(struct
- 	}
- 	sprintf(warnbuf, "%s: %s %s %s.\r\n", level, type2name(warn->qtype), user, msg);
- 	if (write_all(fd, warnbuf, strlen(warnbuf)) < 0)
--		errstr(_("Failed to write quota message for user %Lu to %s: %s\n"), (unsigned long long)warn->caused_id, dev, strerror(errno));
-+		errstr(_("Failed to write quota message for user %llu to %s: %s\n"), (unsigned long long)warn->caused_id, dev, strerror(errno));
- 	close(fd);
- }
- 
-diff -urNp quota-tools-orig/quotaops.c quota-tools/quotaops.c
---- quota-tools-orig/quotaops.c	2006-07-21 17:14:01.000000000 +0200
-+++ quota-tools/quotaops.c	2008-06-19 15:46:21.000000000 +0200
-@@ -266,7 +266,7 @@ int writeprivs(struct dquot *qlist, int 
- 		_("  Filesystem                   blocks       soft       hard     inodes     soft     hard\n"));
- 
- 	for (q = qlist; q; q = q->dq_next) {
--		fprintf(fd, "  %-24s %10Lu %10Lu %10Lu %10Lu %8Lu %8Lu\n",
-+		fprintf(fd, "  %-24s %10llu %10llu %10llu %10llu %8llu %8llu\n",
- 			q->dq_h->qh_quotadev,
- 			(long long)toqb(q->dq_dqb.dqb_curspace),
- 			(long long)q->dq_dqb.dqb_bsoftlimit,
-@@ -344,7 +344,7 @@ int readprivs(struct dquot *qlist, int i
- 	fgets(line, sizeof(line), fd);
- 
- 	while (fgets(line, sizeof(line), fd)) {
--		cnt = sscanf(line, "%s %Lu %Lu %Lu %Lu %Lu %Lu",
-+		cnt = sscanf(line, "%s %llu %llu %llu %llu %llu %llu",
- 			     fsp, &blocks, &bsoft, &bhard, &inodes, &isoft, &ihard);
- 
- 		if (cnt != 7) {
-@@ -370,7 +370,7 @@ int readprivs(struct dquot *qlist, int i
- 			return -1;
- 		}
- 
--		cnt = sscanf(cp, _(" blocks in use: %Lu, limits (soft = %Lu, hard = %Lu)"),
-+		cnt = sscanf(cp, _(" blocks in use: %llu, limits (soft = %llu, hard = %llu)"),
- 			     &blocks, &bsoft, &bhard);
- 		if (cnt != 3) {
- 			errstr(_("%s - %s -- bad format\n"),
-@@ -384,7 +384,7 @@ int readprivs(struct dquot *qlist, int i
- 			return -1;
- 		}
- 
--		cnt = sscanf(cp, _("\tinodes in use: %Lu, limits (soft = %Lu, hard = %Lu)"),
-+		cnt = sscanf(cp, _("\tinodes in use: %llu, limits (soft = %llu, hard = %llu)"),
- 			     &inodes, &isoft, &ihard);
- 		if (cnt != 3) {
- 			errstr(_("%s - %s -- bad format\n"),
-diff -urNp quota-tools-orig/quotasys.c quota-tools/quotasys.c
---- quota-tools-orig/quotasys.c	2007-08-22 13:27:56.000000000 +0200
-+++ quota-tools/quotasys.c	2008-06-19 15:48:45.000000000 +0200
-@@ -369,10 +369,10 @@ void space2str(qsize_t space, char *buf,
- 	if (format)
- 		for (i = 3; i > 0; i--)
- 			if (space >= (1LL << (QUOTABLOCK_BITS*i))*100) {
--				sprintf(buf, "%Lu%c", (unsigned long long)(space+(1 << (QUOTABLOCK_BITS*i))-1) >> (QUOTABLOCK_BITS*i), suffix[i]);
-+				sprintf(buf, "%llu%c", (unsigned long long)(space+(1 << (QUOTABLOCK_BITS*i))-1) >> (QUOTABLOCK_BITS*i), suffix[i]);
- 				return;
- 			}
--	sprintf(buf, "%Lu", (unsigned long long)space);
-+	sprintf(buf, "%llu", (unsigned long long)space);
- }
- 
- /*
-@@ -387,10 +387,10 @@ void number2str(unsigned long long num, 
- 	if (format)
- 		for (i = 4, div = 1000000000000LL; i > 0; i--, div /= 1000)
- 			if (num >= 100*div) {
--				sprintf(buf, "%Lu%c", (num+div-1) / div, suffix[i]);
-+				sprintf(buf, "%llu%c", (num+div-1) / div, suffix[i]);
- 				return;
- 			}
--	sprintf(buf, "%Lu", num);
-+	sprintf(buf, "%llu", num);
- }
- 
- /*
-diff -urNp quota-tools-orig/repquota.c quota-tools/repquota.c
---- quota-tools-orig/repquota.c	2007-02-20 12:54:25.000000000 +0100
-+++ quota-tools/repquota.c	2008-06-19 16:03:24.000000000 +0200
-@@ -158,7 +158,7 @@ static void parse_options(int argcnt, ch
- }
- 
- /* Are we over soft or hard limit? */
--static char overlim(uint usage, uint softlim, uint hardlim)
-+static char overlim(qsize_t usage, qsize_t softlim, qsize_t hardlim)
- {
- 	if ((usage > softlim && softlim) || (usage > hardlim && hardlim))
- 		return '+';
-@@ -181,7 +181,7 @@ static void print(struct dquot *dquot, c
- 		pname[PRINTNAMELEN] = 0;
- 	if (entry->dqb_bsoftlimit && toqb(entry->dqb_curspace) >= entry->dqb_bsoftlimit)
- 		if (flags & FL_RAWGRACE)
--			sprintf(time, "%Lu", (unsigned long long)entry->dqb_btime);
-+			sprintf(time, "%llu", (unsigned long long)entry->dqb_btime);
- 		else
- 			difftime2str(entry->dqb_btime, time);
- 	else
-@@ -198,7 +198,7 @@ static void print(struct dquot *dquot, c
- 	       numbuf[0], numbuf[1], numbuf[2], time);
- 	if (entry->dqb_isoftlimit && entry->dqb_curinodes >= entry->dqb_isoftlimit)
- 		if (flags & FL_RAWGRACE)
--			sprintf(time, "%Lu", (unsigned long long)entry->dqb_itime);
-+			sprintf(time, "%llu", (unsigned long long)entry->dqb_itime);
- 		else
- 			difftime2str(entry->dqb_itime, time);
- 	else
-diff -urNp quota-tools-orig/setquota.c quota-tools/setquota.c
---- quota-tools-orig/setquota.c	2007-11-13 11:44:43.000000000 +0100
-+++ quota-tools/setquota.c	2008-06-19 15:38:36.000000000 +0200
-@@ -184,7 +184,7 @@ static void parse_options(int argcnt, ch
- 		usage();
- 	}
- 	if (flags & FL_PROTO && flags & FL_GRACE) {
--		errstr(_("Prototype user has no sense when editting grace times.\n"));
-+		errstr(_("Prototype user has no sense when editing grace times.\n"));
- 		usage();
- 	}
- 	if (flags & FL_INDIVIDUAL_GRACE && flags & FL_GRACE) {
diff --git a/quota-3.16-rquotad3Ninconsistency.patch b/quota-3.16-rquotad3Ninconsistency.patch
deleted file mode 100644
index d3968d4..0000000
--- a/quota-3.16-rquotad3Ninconsistency.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urNp quota-tools-orig/rquotad.8 quota-tools/rquotad.8
---- quota-tools-orig/rquotad.8	2007-08-27 14:46:50.000000000 +0200
-+++ quota-tools/rquotad.8	2008-12-08 14:04:25.000000000 +0100
-@@ -19,7 +19,7 @@ rquotad, rpc.rquotad \- remote quota ser
- .IX  "remote procedure call services"  "rquotad"  ""  "\fLrquotad\fP \(em remote quota server"
- .B rquotad
- is an
--.BR rpc (3N)
-+.BR rpc (3)
- server which returns quotas for a user of a local filesystem
- which is mounted by a remote machine over the
- .SM NFS\s0.
-@@ -89,7 +89,7 @@ default filesystems
- .PD
- .SH "SEE ALSO"
- .BR quota (1),
--.BR rpc (3N),
-+.BR rpc (3),
- .BR nfs (5),
- .BR services (5),
- .BR inetd (8)
diff --git a/quota-3.16-upstreampatches.patch b/quota-3.16-upstreampatches.patch
deleted file mode 100644
index c054f2b..0000000
--- a/quota-3.16-upstreampatches.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -urNp quota-tools-orig/quotacheck.c quota-tools/quotacheck.c
---- quota-tools-orig/quotacheck.c	2008-08-27 14:27:10.000000000 +0200
-+++ quota-tools/quotacheck.c	2008-08-27 14:32:11.000000000 +0200
-@@ -721,6 +721,19 @@ static int rename_files(struct mntent *m
- 	}
- 	if (ioctl(fd, EXT2_IOC_GETFLAGS, &ext2_flags) < 0)
- 		debug(FL_DEBUG, _("EXT2_IOC_GETFLAGS failed: %s\n"), strerror(errno));
-+
-+/* IMMUTABLE flag set probably because system crashed and quota was not properly
-+ * turned off */
-+	if (ext2_flags & EXT2_IMMUTABLE_FL) {
-+		debug(FL_DEBUG | FL_VERBOSE, _("Quota file %s has IMMUTABLE flag set. Clearing.\n"), filename);
-+		ext2_flags &= ~EXT2_IMMUTABLE_FL;
-+		if (ioctl(fd, EXT2_IOC_SETFLAGS, &ext2_flags) < 0) {
-+			errstr(_("Failed to remove IMMUTABLE flag from quota file %s: %s\n"), filename, strerror(errno));
-+			free(filename);
-+			close(fd);
-+			return -1;
-+    }
-+	}
- 	close(fd);
- #endif
- 	if (flags & FL_BACKUPS) {
-diff -urNp quota-tools-orig/warnquota.c quota-tools/warnquota.c
---- quota-tools-orig/warnquota.c	2007-08-23 16:05:49.000000000 +0200
-+++ quota-tools/warnquota.c	2008-08-27 14:28:13.000000000 +0200
-@@ -1052,8 +1052,8 @@ static void get_host_name(void)
- 
- 	if (uname(&uts))
- 		die(1, _("Cannot get host name: %s\n"), strerror(errno));
--	hostname = uts.nodename;
--	domainname = uts.domainname;
-+	hostname = sstrdup(uts.nodename);
-+	domainname = sstrdup(uts.domainname);
- }
- 
- int main(int argc, char **argv)
diff --git a/quota.spec b/quota.spec
index 4766857..99609a3 100644
--- a/quota.spec
+++ b/quota.spec
@@ -4,8 +4,8 @@
 Name: quota
 Summary: System administration tools for monitoring users' disk usage
 Epoch: 1
-Version: 3.16
-Release: 8%{?dist}
+Version: 3.17
+Release: 1%{?dist}
 License: BSD and GPLv2+
 URL: http://sourceforge.net/projects/linuxquota/
 Group: System Environment/Base
@@ -19,12 +19,8 @@ Patch1: quota-3.06-no-stripping.patch
 Patch2: quota-3.06-man-page.patch
 Patch3: quota-3.06-pie.patch
 Patch4: quota-3.13-wrong-ports.patch
-Patch5: quota-3.16-formatstring.patch
-Patch6: quota-3.16-helpoption.patch
-Patch7: quota-3.16-upstreampatches.patch
-Patch8: quota-3.16-ext4support.patch
-Patch9: quota-3.16-quotaoffhelp.patch
-Patch10: quota-3.16-rquotad3Ninconsistency.patch
+Patch5: quota-3.16-helpoption.patch
+Patch6: quota-3.16-quotaoffhelp.patch
 
 %description
 The quota package contains system administration tools for monitoring
@@ -53,11 +49,7 @@ on remote machines.
 %endif
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1 -b .ext4
-%patch9 -p1 -b .usage
-%patch10 -p1 -b .3N
+%patch6 -p1 -b .usage
 
 #fix typos/mistakes in localized documentation
 for pofile in $(find ./po/*.p*)
@@ -117,8 +109,11 @@ rm -rf %{buildroot}
 %attr(0644,root,root) %{_mandir}/man3/*
 
 %changelog
+* Tue Jan 13 2009 Ondrej Vasik <ovasik@redhat.com> 1:3.17-1
+- new upstream release, remove already applied patches
+
 * Mon Dec 08 2008 Ondrej Vasik <ovasik@redhat.com> 1:3.16-8
-- fix documentation inconsistency (now rpc(3) instead of 
+- fix documentation inconsistency (now rpc(3) instead of
   rpc(3N) in rquotad manpage) (#474836)
 
 * Fri Nov 14 2008 Ondrej Vasik <ovasik@redhat.com> 1:3.16-7
diff --git a/sources b/sources
index ff1a809..8ddedeb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6d1467458a092c4754abef92e7fa6ebe  quota-3.16.tar.gz
+cb3e98a039c0cf98e7c1ad4b50a5bda7  quota-3.17.tar.gz