diff --git a/CHANGES b/CHANGES
index 416b66ce8..13806a899 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,10 @@
 
                                   Changelog
 
+Daniel Fandrich (3 May 2009)
+- Added and disabled test case 563 which shows KNOWN_BUGS #59.  The bug
+  report failed to mention that a proxy must be used to reproduce it.
+
 Yang Tse (2 May 2009)
 - Use a build-time configured curl_socklen_t data type instead of socklen_t.
 
diff --git a/docs/KNOWN_BUGS b/docs/KNOWN_BUGS
index 352061d49..47d256e42 100644
--- a/docs/KNOWN_BUGS
+++ b/docs/KNOWN_BUGS
@@ -27,6 +27,10 @@ may have been fixed since this was written!
   is waiting for the the 100-continue response.
   http://curl.haxx.se/mail/lib-2008-08/0462.html
 
+59. If the CURLOPT_PORT option is used on an FTP URL like
+  "ftp://example.com/file;type=A" using a proxy, the ";type=A" is stripped off.
+  See the comment in parse_remote_port()
+
 58. It seems sensible to be able to use CURLOPT_NOBODY and
   CURLOPT_FAILONERROR with FTP to detect if a file exists or not, but it is
   not working: http://curl.haxx.se/mail/lib-2008-07/0295.html
diff --git a/tests/data/DISABLED b/tests/data/DISABLED
index fb3ae0ec9..3c9e0a384 100644
--- a/tests/data/DISABLED
+++ b/tests/data/DISABLED
@@ -3,4 +3,4 @@
 # test cases are run by runtests.pl. Just add the plain test case numbers, one
 # per line.
 # Lines starting with '#' letters are treated as comments.
-
+563
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index ec27cff36..88cfea02a 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -61,7 +61,7 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46	   \
  test1080 test1081 test1082 test1083 test1084 test1085 test633 test634     \
  test635 test636 test637 test558 test559 test1086 test1087 test1088        \
  test1089 test1090 test1091 test1092 test1093 test1094 test1095 test1096   \
- test1097 test560 test561 test1098 test1099
+ test1097 test560 test561 test1098 test1099 test562 test563
 
 filecheck:
 	@mkdir test-place; \
diff --git a/tests/data/test563 b/tests/data/test563
new file mode 100644
index 000000000..5d2d7338b
--- /dev/null
+++ b/tests/data/test563
@@ -0,0 +1,57 @@
+<testcase>
+<info>
+<keywords>
+FTP
+CURLOPT_PORT
+HTTP proxy
+</keywords>
+</info>
+
+# Server-side
+<reply>
+<data nocheck="yes">
+HTTP/1.1 200 OK swsclose
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Accept-Ranges: bytes
+Content-Length: 6
+
+hello
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+http
+</server>
+<tool>
+lib562
+</tool>
+ <name>
+FTP type=A URL and CURLOPT_PORT set and proxy
+ </name>
+
+<setenv>
+ftp_proxy=http://%HOSTIP:%HTTPPORT/
+</setenv>
+# note that we need quotes around the URL below to make sure the shell doesn't
+# treat the semicolon as a separator!
+ <command>
+"ftp://%HOSTIP:23456/563;type=A" %FTPPORT
+</command>
+
+</client>
+
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+GET ftp://%HOSTIP:%FTPPORT/563;type=A HTTP/1.1
+Host: %HOSTIP:%FTPPORT
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+</protocol>
+</verify>
+</testcase>