diff --git a/includes/file.inc b/includes/file.inc
index 384bd1ef4b8284a8b87d270e7b7c67a1a674791d..b6231e4b15243f7fadab04c50a055fa31b46d440 100644
--- a/includes/file.inc
+++ b/includes/file.inc
@@ -959,7 +959,7 @@ function file_directory_temp() {
  * @return A string containing the path to Drupal's 'files' directory.
  */
 function file_directory_path() {
-  return variable_get('file_directory_path', 'sites/default/files');
+  return variable_get('file_directory_path', conf_path() .'/files');
 }
 
 /**