diff --git a/src/glade/delugegtk.glade b/glade/delugegtk.glade
similarity index 100%
rename from src/glade/delugegtk.glade
rename to glade/delugegtk.glade
diff --git a/src/glade/dgtkpopups.glade b/glade/dgtkpopups.glade
similarity index 100%
rename from src/glade/dgtkpopups.glade
rename to glade/dgtkpopups.glade
diff --git a/src/glade/dgtkpref.glade b/glade/dgtkpref.glade
similarity index 100%
rename from src/glade/dgtkpref.glade
rename to glade/dgtkpref.glade
diff --git a/src/pixmaps/deluge128.png b/pixmaps/deluge128.png
similarity index 100%
rename from src/pixmaps/deluge128.png
rename to pixmaps/deluge128.png
diff --git a/src/pixmaps/deluge192.png b/pixmaps/deluge192.png
similarity index 100%
rename from src/pixmaps/deluge192.png
rename to pixmaps/deluge192.png
diff --git a/src/pixmaps/deluge22.png b/pixmaps/deluge22.png
similarity index 100%
rename from src/pixmaps/deluge22.png
rename to pixmaps/deluge22.png
diff --git a/src/pixmaps/deluge256.png b/pixmaps/deluge256.png
similarity index 100%
rename from src/pixmaps/deluge256.png
rename to pixmaps/deluge256.png
diff --git a/src/pixmaps/deluge32.png b/pixmaps/deluge32.png
similarity index 100%
rename from src/pixmaps/deluge32.png
rename to pixmaps/deluge32.png
diff --git a/setup.py b/setup.py
index 7f49bde6e..cf164e371 100644
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,8 @@ setup(name="deluge", fullname="Deluge BitTorrent Client", version="0.5.0",
 	scripts=["scripts/deluge"],
 	packages=['deluge'],
 	package_dir = {'deluge': 'src'},
-	package_data={'deluge': ['glade/*.glade', 'pixmaps/*.png']},
+	data_files=[("share/deluge/glade", ["glade/delugegtk.glade", "glade/dgtkpopups.glade", "glade/dgtkpref.glade"]),
+                                ("share/deluge/pixmaps", ["pixmaps/deluge32.png","pixmaps/deluge128.png"])],
 	ext_package='deluge',
 	ext_modules=[deluge_core]
 	)
diff --git a/src/dcommon.py b/src/dcommon.py
index 3a1e81860..9f864ef4d 100644
--- a/src/dcommon.py
+++ b/src/dcommon.py
@@ -23,8 +23,9 @@ import sys, os, os.path, webbrowser
 PROGRAM_NAME = "Deluge"
 PROGRAM_VERSION = "0.4.9.0"
 DELUGE_DIR = os.path.abspath(os.path.dirname(sys.argv[0]))
-GLADE_DIR = DELUGE_DIR + "/glade"
-PIXMAP_DIR = DELUGE_DIR + "/pixmaps"
+PREFIX = sys.prefix
+GLADE_DIR = PREFIX + "/share/deluge/glade"
+PIXMAP_DIR = PREFIX + "/share/deluge/pixmaps"
 
 class DelugePreferences:
 	def __init__(self):