diff --git a/ChangeLog b/ChangeLog
index 183784ba8..377773f18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,6 +33,8 @@
  + Applied patch to fix a UUID bug on Solaris 8 (thanks to Steven de Brouwer).
  + The task man page is now installed.  Try "man task" (thanks to Federico
    Hernandez and P.C. Shyamshankar).
+ + Fixed bug that causes task to create a default .task directory, even if
+   .taskrc:data.location specified otherwise (thanks to Federico Hernandez).
 
 ------ old releases ------------------------------
 
diff --git a/html/task.html b/html/task.html
index 78eb85b93..e4b30d3fa 100644
--- a/html/task.html
+++ b/html/task.html
@@ -174,6 +174,8 @@
                   <li>Applied patch to fix a UUID bug on Solaris 8 (thanks to Steven de Brouwer).
                   <li>The task man page is now installed.  Try "man task" (thanks to Federico
                       Hernandez and P.C. Shyamshankar).
+                  <li>Fixed bug that causes task to create a default .task directory, even if
+                      .taskrc:data.location specified otherwise (thanks to Federico Hernandez).
                 </ul>
 
                 <p>
diff --git a/src/Config.cpp b/src/Config.cpp
index 1b07606a8..633c5bd76 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -219,6 +219,9 @@ void Config::createDefault (const std::string& home)
 
   this->load (rcFile);
 
+  // Get the data.location value from the (potentially newly created) .taskrc
+  // file.
+  dataDir = this->get ("data.location", dataDir);
   if (-1 == access (dataDir.c_str (), F_OK))
     mkdir (dataDir.c_str (), S_IRWXU);
 }