diff --git a/ChangeLog b/ChangeLog
index 60b48a6db..a9bc5f722 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,7 @@ Deluge 0.9.08 - "1.0.0_RC8" (In Development)
   * Attempt to automatically upgrade a 0.5.x state file to new format
  
  Plugins:
-  * Fix bug in Blocklist that prevented downloading of new file every X days
+  * Fix bug in Blocklist that prevented downloading a new file every X days
   
  GtkUI:
   * Sort filenames alphabetically in add torrent dialog
diff --git a/deluge/core/core.py b/deluge/core/core.py
index 58bcadc2f..363aee8e1 100644
--- a/deluge/core/core.py
+++ b/deluge/core/core.py
@@ -67,7 +67,7 @@ DEFAULT_PREFS = {
     "download_location": deluge.common.get_default_download_dir(),
     "listen_ports": [6881, 6891],
     "copy_torrent_file": False,
-    "torrentfiles_location": os.path.join(deluge.common.get_default_download_dir(), "torrentfiles"),
+    "torrentfiles_location": deluge.common.get_default_download_dir(),
     "plugins_location": os.path.join(deluge.configmanager.get_config_dir(), "plugins"),
     "state_location": os.path.join(deluge.configmanager.get_config_dir(), "state"),
     "prioritize_first_last_pieces": False,