diff --git a/deluge/ui/gtkui/menubar.py b/deluge/ui/gtkui/menubar.py
index 0b38a5b7b..fb65102a7 100644
--- a/deluge/ui/gtkui/menubar.py
+++ b/deluge/ui/gtkui/menubar.py
@@ -385,7 +385,7 @@ class MenuBar(component.Component):
 
     def on_menuitem_faq_activate(self, data=None):
         log.debug("on_menuitem_faq_activate")
-        common.open_url_in_browser("http://deluge-torrent.org/faq.php")
+        common.open_url_in_browser("http://dev.deluge-torrent.org/wiki/Faq")
 
     def on_menuitem_community_activate(self, data=None):
         log.debug("on_menuitem_community_activate")
diff --git a/deluge/ui/webui/debugerror.py b/deluge/ui/webui/debugerror.py
index 96f1fe07e..3a9f32ec6 100644
--- a/deluge/ui/webui/debugerror.py
+++ b/deluge/ui/webui/debugerror.py
@@ -165,7 +165,7 @@ $def with (exception_type, exception_value, frames, exception_message, version_i
     <!--ERROR-MARKER-->
     Oops, Deluge Broke :-( , You might have found a bug, or you did something really stupid ;-).
     <br />If the error persists :<br />
-    Read the <a href="http://deluge-torrent.org/faq">Faq</a>.<br />
+    Read the <a href="http://dev.deluge-torrent.org/wiki/Faq">Faq</a>.<br />
     Try downloading the latest version at
     <a href="http://deluge-torrent.org">deluge-torrent.org</a>
     <br />Visit the  <a href="http://forum.deluge-torrent.org">forum</a>