diff --git a/CHANGES b/CHANGES
index 0b26967a2..702e9f29b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,11 @@
Changelog
+Dan F (13 April 2007)
+- Added test cases 294 and 295 to test --ftp-account handling
+
+- Improved handling of out of memory in ftp.
+
Yang Tse (13 April 2007)
- Fix test case 534 which started to fail 2007-04-13 due to the existance
of a new host on the net with the same silly domain the test was using
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 59eb9a2d5..70731e325 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -39,4 +39,4 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46 \
test534 test535 test281 test537 test282 test283 test284 test538 test285 \
test286 test307 test308 test287 test400 test288 test600 test601 test602 \
test603 test401 test402 test290 test291 test292 test293 test403 test404 \
- test405 test604 test605 test606 test607 test608 test609
+ test405 test604 test605 test606 test607 test608 test609 test294 test295
diff --git a/tests/data/test294 b/tests/data/test294
new file mode 100644
index 000000000..4d7f2b8e9
--- /dev/null
+++ b/tests/data/test294
@@ -0,0 +1,64 @@
+
+
+
+FTP
+PASV
+LIST
+ACCT
+--ftp-account
+
+
+#
+# Server-side
+
+# When doing LIST, we get the default list output hard-coded in the test
+# FTP server
+
+total 20
+drwxr-xr-x 8 98 98 512 Oct 22 13:06 .
+drwxr-xr-x 8 98 98 512 Oct 22 13:06 ..
+drwxr-xr-x 2 98 98 512 May 2 1996 .NeXT
+-r--r--r-- 1 0 1 35 Jul 16 1996 README
+lrwxrwxrwx 1 0 1 7 Dec 9 1999 bin -> usr/bin
+dr-xr-xr-x 2 0 1 512 Oct 1 1997 dev
+drwxrwxrwx 2 98 98 512 May 29 16:04 download.html
+dr-xr-xr-x 2 0 1 512 Nov 30 1995 etc
+drwxrwxrwx 2 98 1 512 Oct 30 14:33 pub
+dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
+
+
+REPLY PASS 332 Give me an ACCT now
+REPLY ACCT 230 Thank-you for the ACCT
+
+
+
+#
+# Client-side
+
+
+ftp
+
+
+FTP --ftp-account on ACCT request
+
+
+ftp://%HOSTIP:%FTPPORT/294/ --ftp-account "data for acct"
+
+
+
+#
+# Verify data after the test has been "shot"
+
+
+USER anonymous
+PASS ftp@example.com
+ACCT data for acct
+PWD
+CWD 294
+EPSV
+TYPE A
+LIST
+QUIT
+
+
+
diff --git a/tests/data/test295 b/tests/data/test295
new file mode 100644
index 000000000..5b1ddcf6b
--- /dev/null
+++ b/tests/data/test295
@@ -0,0 +1,45 @@
+
+
+
+FTP
+PASV
+LIST
+ACCT
+FAILURE
+
+
+#
+# Server-side
+
+
+REPLY PASS 332 Give me an ACCT now
+REPLY PWD 530 No ACCT, go away
+
+
+
+#
+# Client-side
+
+
+ftp
+
+
+FTP ACCT request without --ftp-account
+
+
+ftp://%HOSTIP:%FTPPORT/295/
+
+
+
+#
+# Verify data after the test has been "shot"
+
+
+67
+
+
+USER anonymous
+PASS ftp@example.com
+
+
+