diff --git a/debian/manpages b/debian/manpages
index 8810c2a49..9dfd65956 100644
--- a/debian/manpages
+++ b/debian/manpages
@@ -1,2 +1,2 @@
-deluge/docs/man/deluge.1
-deluge/docs/man/deluged.1
+docs/man/deluge.1
+docs/man/deluged.1
diff --git a/deluge/i18n/POTFILES.in b/deluge/i18n/POTFILES.in
index dc829237d..1d0fe4c07 100644
--- a/deluge/i18n/POTFILES.in
+++ b/deluge/i18n/POTFILES.in
@@ -17,7 +17,7 @@ deluge/ui/gtkui/glade/dgtkpopups.glade
 deluge/ui/gtkui/glade/tray_menu.glade
 deluge/ui/gtkui/glade/main_window.glade
 deluge/bencode.py
-deluge/docs/source/conf.py
+docs/source/conf.py
 deluge/core/autoadd.py
 deluge/core/preferencesmanager.py
 deluge/core/filtermanager.py
diff --git a/setup.py b/setup.py
index b5d900e02..ca62a9ecb 100644
--- a/setup.py
+++ b/setup.py
@@ -348,7 +348,7 @@ _data_files = [
     ('share/icons/hicolor/96x96/apps', ['deluge/data/icons/hicolor/96x96/apps/deluge.png']),
     ('share/applications', ['deluge/data/share/applications/deluge.desktop']),
     ('share/pixmaps', ['deluge/data/pixmaps/deluge.png', 'deluge/data/pixmaps/deluge.xpm']),
-    ('share/man/man1', ['deluge/docs/man/deluge.1', 'deluge/docs/man/deluged.1'])
+    ('share/man/man1', ['docs/man/deluge.1', 'docs/man/deluged.1'])
 ]
 
 # Main setup