diff --git a/CHANGES b/CHANGES
index 2d7073860..38ca3c14e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,14 @@
 
                                   Changelog
 
+Dan F (7 March 2007)
+- Honour --ftp-ssl-control on ftps:// URLs to allow encrypted control and
+  unencrypted data connections.
+
+Dan F (6 March 2007)
+- Fixed a couple of improper pointer uses detected by valgrind in test
+  cases 181 & 216.
+
 Daniel (2 March 2007)
 - Robert A. Monat and Shmulik Regev helped out to fix the new */Makefile.vc8
   makefiles that are included in the source release archives, generated from
diff --git a/lib/url.c b/lib/url.c
index 87a07736e..b80d79239 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -3124,7 +3124,8 @@ static CURLcode CreateConnection(struct SessionHandle *data,
     if(strequal(conn->protostr, "FTPS")) {
 #ifdef USE_SSL
       conn->protocol |= PROT_FTPS|PROT_SSL;
-      conn->ssl[SECONDARYSOCKET].use = TRUE; /* send data securely */
+      /* send data securely unless specifically requested otherwise */
+      conn->ssl[SECONDARYSOCKET].use = data->set.ftp_ssl != CURLFTPSSL_CONTROL;
       port = PORT_FTPS;
 #else
       failf(data, LIBCURL_NAME