diff --git a/ChangeLog b/ChangeLog
index 7b6d184e..a6c85d3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue, 22 Jan 2008 08:13:42 +0100 <thp@perli.net>
+Create Bittorrent download directory on startup
+
+	* src/gpodder/libgpodder.py: Create Bittorrent download directory on
+	startup, so the first time gPodder preferences are shown, the download
+	folder will exist and now throw an error
+
 Mon, 21 Jan 2008 21:41:59 +0100 <thp@perli.net>
 Updated French translation file with correct encoding
 
diff --git a/src/gpodder/libgpodder.py b/src/gpodder/libgpodder.py
index 09b08f0c..c8db3b85 100644
--- a/src/gpodder/libgpodder.py
+++ b/src/gpodder/libgpodder.py
@@ -72,6 +72,7 @@ class gPodderLibClass( object):
             self.migrate_channels_xml()
 
         self.config = config.Config( os.path.join( gpodder_dir, 'gpodder.conf'))
+        util.make_directory(self.config.bittorrent_dir)
 
         # We need to make a seamless upgrade, so by default the video player is not specified
         # so the first time this application is run it will detect this and set it to the same