diff --git a/CHANGES b/CHANGES
index c866fd8f1f74db86351e17a0ab257376b7836868..bdca200443fb061d6b8eea4f4399271232459c5c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,11 @@
 
                                   Changelog
 
+Daniel S (1 Nov 2007)
+- Toby Peterson patched a memory problem in the command line tool that
+  happened when a user had a home dir as an empty string. curl would then do
+  free() on a wrong area.
+
 Dan F (1 Nov 2007)
 - Fixed curl-config --features to not display libz when it wasn't used
   due to a missing header file.
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 82cc069edf4493da0a2e1905c41312d82d92eb38..d2d64d98f83efa5edf269661d218af9c649241dd 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -16,6 +16,7 @@ This release includes the following bugfixes:
 
  o curl-config --features and --protocols show the correct output when built
    with NSS, and also when SCP, SFTP and libz are not available
+ o free problem in the curl tool for users with empty home dir
 
 This release includes the following known bugs:
 
@@ -32,6 +33,6 @@ New curl mirrors:
 This release would not have looked like this without help, code, reports and
 advice from friends like these:
 
- 
+ Dan Fandrich, Gisle Vanem, Toby Peterson
  
         Thanks! (and sorry if I forgot to mention someone)
diff --git a/src/homedir.c b/src/homedir.c
index f27aa6924e0eb27ec926b995ea91d7ff8d9f20be..d9bc39fe51c6c8a754327b6930558088bebbe61f 100644
--- a/src/homedir.c
+++ b/src/homedir.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2005, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -106,6 +106,8 @@ char *homedir(void)
 #endif
      if (home && home[0])
        home = strdup(home);
+     else
+       home = NULL;
    }
  }
 #endif /* PWD-stuff */