diff --git a/CHANGES b/CHANGES
index 1b735bac3e2a0eea05ba007d15240115258ec97e..5c411cfd867fc791c984bf3ec6e8a075f2a7cfe5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,12 @@
 
                                History of Changes
 
+Daniel (19 January 2002)
+- Antonio filed bug report #505514 and provided a fix! When doing multipart
+  formposts, libcurl would include an error text in the actual post if a
+  specified file wasn't found. This is not libcurl's job. Instead we add an
+  empty part.
+
 Daniel (18 January 2002)
 - Played around with stricter compiler warnings for gcc (when ./configure
   --enable-debug is used) and changed some minor things to stop the warnings.
diff --git a/docs/TODO b/docs/TODO
index bfa7aa067d466dcc8e49100991d377c9848f55e5..3597ab5bd475b48d5ae491ba02f89b3e7c3fef30 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -48,6 +48,10 @@ TODO
  * Set the SO_KEEPALIVE socket option to make libcurl notice and disconnect
    very long time idle connections.
 
+ * Make sure we don't ever loop because of non-blocking sockets return
+   EWOULDBLOCK or similar. This concerns the HTTP request sending, the FTP
+   command sending etc.
+
  DOCUMENTATION
 
  * Document all CURLcode error codes, why they happen and what most likely
diff --git a/include/curl/curl.h b/include/curl/curl.h
index 2e948d8a84a25177bb7674e79d24b23ad80f8da8..f791ca70ca9592664e2fd31bc1eadfc43f19cba3 100644
--- a/include/curl/curl.h
+++ b/include/curl/curl.h
@@ -613,7 +613,7 @@ CURLcode curl_global_init(long flags);
 void curl_global_cleanup(void);
 
 /* This is the version number */
-#define LIBCURL_VERSION "7.9.3-pre3"
+#define LIBCURL_VERSION "7.9.3-pre4"
 #define LIBCURL_VERSION_NUM 0x070903
 
 /* linked-list structure for the CURLOPT_QUOTE option (and other) */
diff --git a/src/version.h b/src/version.h
index 1639fa84b0e34d4fe66173cc796dd32eba13e366..6fd7991ea832055f4e70481e5b64a2f69edfb7fb 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,3 +1,3 @@
 #define CURL_NAME "curl"
-#define CURL_VERSION "7.9.3-pre3"
+#define CURL_VERSION "7.9.3-pre4"
 #define CURL_ID CURL_NAME " " CURL_VERSION " (" OS ") "