diff --git a/CHANGES b/CHANGES
index 2a94df03a..daa7644dd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,7 +6,36 @@
 
                                   Changelog
 
+Version 7.10.4-pre2 (24 Feb 2003)
+
+Daniel (24 Feb)
+- Kjetil Jacobsen found out that setting CURLOPT_MAXCONNECTS to a value higher
+  than 5 could cause a segfault.
+
+- I believe I fixed the 'Expect: 100-continue' behavior that has been broken
+  for a while (I think since my change dated Dec 10 2002). When this header is
+  used, libcurl should wait for a HTTP 100 (or timeout) before sending the
+  post/put data.
+
+Daniel (14 Feb)
+- Matthew Clarke provided some info what to modify to make curl build
+  flawlessly on AIX 3.2.5.
+
+- Martin C. Martin found and fixed a problem in the multi interface when
+  running on Windows and trying to connect to a port without a listener.
+
+Daniel (13 Feb)
+- Christopher R. Palmer fixed Curl_base64_encode() to deal with zeroes in the
+  data to encode.
+
 Daniel (4 Feb)
+- Jean-Philippe added the first code that enables the 'share' system. This
+  should now enable sharing of DNS data between two curl easy handles.
+
+- Incorporated Nico Baggus' fixes to again compile flawlessly on VMS.
+
+- James Bursa corrected a bad comment in the public include file curl/multi.h
+
 - Peter Forret reported one of those error:00000000 cases in libcurl again
   when connecting to a HTTPS site, and this time I did discover some oddities
   in how curl reports SSL errors back. It could miss showing the actual error.
diff --git a/CVS-INFO b/CVS-INFO
index ac1b02adb..325b6b564 100644
--- a/CVS-INFO
+++ b/CVS-INFO
@@ -15,7 +15,8 @@ Compile and build instructions follow below.
   CHANGES.0     contains ancient changes.
   CHANGES.$year contains changes for the particular year.
 
-  memanalyze.pl is for analyzing the output generated by curl if -DMALLOCDEBUG
+  tests/memanalyze.pl
+                is for analyzing the output generated by curl if -DMALLOCDEBUG
                 is used when compiling
 
   buildconf     builds the makefiles and configure stuff
diff --git a/Makefile.am b/Makefile.am
index c1dfcd770..c634b0e9f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@
 AUTOMAKE_OPTIONS = foreign
 
 EXTRA_DIST = CHANGES COPYING maketgz SSLCERTS reconf Makefile.dist	\
-  curl-config.in build_vms.com curl-style.el sample.emacs
+  curl-config.in build_vms.com curl-style.el sample.emacs testcurl.sh
 
 bin_SCRIPTS = curl-config
 
diff --git a/docs/TODO b/docs/TODO
index e127a9c1f..feb87457a 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -24,9 +24,9 @@ TODO
    less copy of data and thus a faster operation.
    [http://curl.haxx.se/dev/no_copy_callbacks.txt]
 
- * Add asynchronous name resolving (http://daniel.haxx.se/resolver/). This
-   should be made to work on most of the supported platforms, or otherwise it
-   isn't really interesting.
+ * Add asynchronous name resolving (http://libdenise.sf.net/). This should be
+   made to work on most of the supported platforms, or otherwise it isn't
+   really interesting.
 
  * Data sharing. Tell which easy handles within a multi handle that should
    share cookies, connection cache, dns cache, ssl session cache.  Full
@@ -57,12 +57,15 @@ TODO
  LIBCURL - multi interface
 
  * Make sure we don't ever loop because of non-blocking sockets return
-   EWOULDBLOCK or similar. This FTP command sending etc.
+   EWOULDBLOCK or similar. This FTP command sending, the SSL connection etc.
 
- * Make uploads treated better. We need a way to tell libcurl we have data to
-   write, as the current system expects us to upload data each time the socket
-   is writable and there is no way to say that we want to upload data soon
-   just not right now, without that aborting the upload.
+ * Make transfers treated more carefully. We need a way to tell libcurl we
+   have data to write, as the current system expects us to upload data each
+   time the socket is writable and there is no way to say that we want to
+   upload data soon just not right now, without that aborting the upload. The
+   opposite situation should be possible as well, that we tell libcurl we're
+   ready to accept read data. Today libcurl feeds the data as soon as it is
+   available for reading, no matter what.
 
  DOCUMENTATION
 
diff --git a/include/curl/curl.h b/include/curl/curl.h
index 04171ba9a..dd05134bb 100644
--- a/include/curl/curl.h
+++ b/include/curl/curl.h
@@ -811,8 +811,8 @@ CURLcode curl_global_init(long flags);
 void curl_global_cleanup(void);
 
 /* This is the version number */
-#define LIBCURL_VERSION "7.10.3"
-#define LIBCURL_VERSION_NUM 0x070a03
+#define LIBCURL_VERSION "7.10.4-pre2"
+#define LIBCURL_VERSION_NUM 0x070a04
 
 /* linked-list structure for the CURLOPT_QUOTE option (and other) */
 struct curl_slist {
diff --git a/src/version.h b/src/version.h
index 7928063a1..f97997464 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,3 +1,3 @@
 #define CURL_NAME "curl"
-#define CURL_VERSION "7.10.3"
+#define CURL_VERSION "7.10.4-pre2"
 #define CURL_ID CURL_NAME " " CURL_VERSION " (" OS ") "
diff --git a/tests/server/sws.c b/tests/server/sws.c
index c93af94ee..0b1865a58 100644
--- a/tests/server/sws.c
+++ b/tests/server/sws.c
@@ -226,6 +226,7 @@ static int get_request(int sock, int *part)
     if (got <= 0) {
       if (got < 0) {
         perror("recv");
+        logmsg("recv() returned error");
         return DOCNUMBER_INTERNAL;
       }
       logmsg("Connection closed by client");
@@ -312,7 +313,7 @@ static int get_request(int sock, int *part)
   
   logmsg("Got illegal request");
   fprintf(stderr, "Got illegal request\n");
-  return -1;
+  return DOCNUMBER_404;
 }