diff --git a/.cvsignore b/.cvsignore
index 80cac6d..881ec84 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-netkit-ftp-0.17-pre20000412.tar.gz
+netkit-ftp-0.17.tar.bz2
diff --git a/ftp.spec b/ftp.spec
index 309c757..b67e84c 100644
--- a/ftp.spec
+++ b/ftp.spec
@@ -1,14 +1,12 @@
-%define	_snapshot	-pre20000412
-
 Summary: The standard UNIX FTP (File Transfer Protocol) client.
 Name: ftp
 Version: 0.17
-Release: 6
+Release: 7
 Copyright: BSD
 Group: Applications/Internet
-Source0: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit-devel/netkit-ftp-%{version}%{_snapshot}.tar.gz
-Patch0: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit-devel/netkit-combo-0.16-SECURITY.patch
+Source0: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit-devel/netkit-ftp-%{version}.tar.bz2
 Patch1: netkit-ftp-0.17-pre20000412.pasv-security.patch
+Patch2: netkit-ftp-0.17-acct.patch
 BuildRoot: /var/tmp/%{name}-root
 
 %description
@@ -20,9 +18,9 @@ If your system is on a network, you should install ftp in order to do
 file transfers.
 
 %prep
-%setup -q -n netkit-ftp-%{version}%{_snapshot}
-%patch0 -p2
+%setup -q -n netkit-ftp-%{version}
 %patch1 -p1
+%patch2 -p1 -b .acct
 
 %build
 sh configure
@@ -56,6 +54,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man5/netrc.*
 
 %changelog
+* Sun Jan 21 2001 Bernhard Rosenkraenzer <bero@redhat.com>
+- Update to 0.17 final
+- Fix up ACCT support in netrc (Bug #17353)
+
 * Wed Aug 16 2000 Philipp Knirsch <pknirsch@redhat.com>
 - Switched the default transfer protocol from PORT to PASV as proposed on
   bugzilla (#16134)
diff --git a/netkit-ftp-0.17-acct.patch b/netkit-ftp-0.17-acct.patch
new file mode 100644
index 0000000..aaadc1f
--- /dev/null
+++ b/netkit-ftp-0.17-acct.patch
@@ -0,0 +1,12 @@
+--- netkit-ftp-0.17/ftp/ftp.c.acct	Sun Jan 21 00:08:29 2001
++++ netkit-ftp-0.17/ftp/ftp.c	Sun Jan 21 00:09:04 2001
+@@ -254,7 +254,8 @@
+ 	if (n == CONTINUE) {
+ 		aflag++;
+ 		/* fflush(stdout); */
+-		zacct = getpass("Account:");
++		if(zacct==NULL)
++			zacct = getpass("Account:");
+ 		n = command("ACCT %s", zacct);
+ 	}
+ 	if (n != COMPLETE) {
diff --git a/sources b/sources
index bdef9ef..c63312b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-63d58c55d19f025b5da8c0924c570243  netkit-ftp-0.17-pre20000412.tar.gz
+95ee911106b727757662ad765b0e0353  netkit-ftp-0.17.tar.bz2