diff --git a/ChangeLog b/ChangeLog
index 225fd7336..73411a7a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,11 +6,13 @@ Deluge 0.9.05 - "1.0.0_RC5" (In Development)
  
  GtkUI:
   * Handle shutting down more cleanly
-  * Add translators to credits
   
  Plugins:
   * Improve the Blocklist plugin preferences page.
   
+ Windows:
+  * Fix drag n' drop support
+  
 Deluge 0.9.04 - "1.0.0_RC4" (29 July 2008)
  Core:
   * Fix building with gcc 4.3
diff --git a/deluge/ui/gtkui/mainwindow.py b/deluge/ui/gtkui/mainwindow.py
index dd3772b42..f49ff31a8 100644
--- a/deluge/ui/gtkui/mainwindow.py
+++ b/deluge/ui/gtkui/mainwindow.py
@@ -193,6 +193,9 @@ class MainWindow(component.Component):
     def on_drag_data_received_event(self, widget, drag_context, x, y, selection_data, info, timestamp):
         args = []
         for uri in selection_data.data.split():
+            if deluge.common.windows_check():
+                uri = uri[7:]
+                uri = urllib.url2pathname(uri).strip("\r\n\x00")
             args.append(urllib.unquote(urlparse(uri).path))
         process_args(args)
         drag_context.finish(True, True)