diff --git a/CHANGES b/CHANGES
index 7c23141f1..07079c0fa 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,17 @@
 
                                History of Changes
 
+Daniel (29 May 2000)
+- Corrected the bits.* assignments when using CURLOPT options that only
+  toggles one of those bits.
+
+- Applied the huge patches from David LeBlanc <dleblanc at qnx.com> that add
+  usage of the gethostbyname_r() and similar functions in case they're around,
+  since that make libcurl much better threadsafe in many systems (such as
+  solaris). I added the checks for these functions to the configure script.
+
+  I can't explain why, but the inet_ntoa_r() function did not appear in my
+  Solaris include files, I had to add my own include file for this for now.
 
 Daniel (22 May 2000)
 - Jörn Hartroth brought me fixes to make the win32 version compile properly as
diff --git a/config.h.in b/config.h.in
index c9f96d75e..2521fd327 100644
--- a/config.h.in
+++ b/config.h.in
@@ -49,6 +49,12 @@
 /* Define if you have the gethostbyaddr function.  */
 #undef HAVE_GETHOSTBYADDR
 
+/* Define if you have the gethostbyaddr_r function.  */
+#undef HAVE_GETHOSTBYADDR_R
+
+/* Define if you have the gethostbyname_r function.  */
+#undef HAVE_GETHOSTBYNAME_R
+
 /* Define if you have the gethostname function.  */
 #undef HAVE_GETHOSTNAME
 
@@ -67,6 +73,9 @@
 /* Define if you have the inet_ntoa function.  */
 #undef HAVE_INET_NTOA
 
+/* Define if you have the inet_ntoa_r function.  */
+#undef HAVE_INET_NTOA_R
+
 /* Define if you have the perror function.  */
 #undef HAVE_PERROR
 
@@ -190,6 +199,9 @@
 /* Define if you have the <sys/stat.h> header file.  */
 #undef HAVE_SYS_STAT_H
 
+/* Define if you have the <sys/time.h> header file.  */
+#undef HAVE_SYS_TIME_H
+
 /* Define if you have the <sys/types.h> header file.  */
 #undef HAVE_SYS_TYPES_H
 
diff --git a/configure.in b/configure.in
index 30e1b2ac4..1163e9080 100644
--- a/configure.in
+++ b/configure.in
@@ -178,11 +178,14 @@ AC_CHECK_FUNCS( socket \
                 stricmp \
                 strcmpi \
                 gethostname \
+                gethostbyname_r \
                 gethostbyaddr \
+                gethostbyaddr_r \
                 getservbyname \
                 gettimeofday \
                 inet_addr \
                 inet_ntoa \
+                inet_ntoa_r \
                 tcsetattr \
                 tcgetattr \
                 perror \
diff --git a/docs/TODO b/docs/TODO
index 7f0a7f35c..746a48c7e 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -26,10 +26,9 @@ seven. Let's do a serious attempt to include most of this.
   Move non-URL related functions that are used by both the lib and the curl
   application to a separate "portability lib".
 
-  Correct the lib's getenv() call as it is not threadsafe under win32.
-
   Add support for other languages than C (not important)
 
+  Improve the -K config file parser.
 
 For the future
 
@@ -100,7 +99,7 @@ For the future
  * Other proxies
    Ftp-kind proxy, Socks5, whatever kind of proxies are there?
 
- * IPv6 Awareness
+ * IPv6 Awareness and support
    Where ever it would fit. I am not that into v6 yet to fully grasp what we
    would need to do, but letting the autoconf search for v6-versions of a few
    functions and then use them instead is of course the first thing to do...
diff --git a/src/hugehelp.c b/src/hugehelp.c
index 316d3e39d..bdef2e7c5 100644
--- a/src/hugehelp.c
+++ b/src/hugehelp.c
@@ -231,6 +231,8 @@ puts (
 "          Makes  curl  scan  the  .netrc  file in the user's home\n"
 "          directory for login name and password.  This  is  typi­\n"
 "          cally  used  for  ftp  on unix. If used with http, curl\n"
+);
+ puts(
 "          will  enable  user  authentication.  See  netrc(5)  for\n"
 "          details  on  the file format. Curl will not complain if\n"
 "          that file hasn't the right permissions (it  should  not\n"
@@ -468,6 +470,8 @@ puts (
 "\n"
 "     -z/--time-cond <date expression>\n"
 "          (HTTP) Request to get a file  that  has  been  modified\n"
+);
+ puts(
 "          later  than  the  given  time and date, or one that has\n"
 "          been modified before that time. The date expression can\n"
 "          be all sorts of date strings or if it doesn't match any\n"
@@ -688,6 +692,9 @@ puts (
 "      - Damien Adant <dams@usa.net>\n"
 "      - Chris <cbayliss@csc.come>\n"
 "      - Marco G. Salvagno <mgs@whiz.cjb.net>\n"
+"      - Paul Marquis <pmarquis@iname.com>\n"
+"      - David LeBlanc <dleblanc@qnx.com>\n"
+"      - Rich Gray at Plus Technologies\n"
 "\n"
 "WWW\n"
 "     http://curl.haxx.nu\n"
@@ -791,6 +798,8 @@ puts (
 "        curl -u user:passwd -x my-proxy:888 http://www.get.this/\n"
 "\n"
 " Some proxies require special authentication. Specify by using -U as above:\n"
+);
+ puts(
 "\n"
 "        curl -U user:passwd -x my-proxy:888 http://www.get.this/\n"
 "\n"
@@ -1060,6 +1069,8 @@ puts (
 "\n"
 "  From left-to-right:\n"
 "   %             - percentage completed of the whole transfer\n"
+);
+ puts(
 "   Total         - total size of the whole expected transfer\n"
 "   %             - percentage completed of the download\n"
 "   Received      - currently downloaded amount of bytes\n"
@@ -1340,6 +1351,8 @@ puts (
 "\n"
 "\n"
 "  The usage of the -x/--proxy flag overrides the environment variables.\n"
+);
+ puts(
 "\n"
 "NETRC\n"
 "\n"
diff --git a/src/version.h b/src/version.h
index 96c57e396..56085c9e4 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,3 +1,3 @@
 #define CURL_NAME "curl"
-#define CURL_VERSION "7.0beta"
+#define CURL_VERSION "7.0.1beta"
 #define CURL_ID CURL_NAME " " CURL_VERSION " (" OS ") "