diff --git a/deluge.desktop b/deluge.desktop
index 065e2795c..481cf10be 100644
--- a/deluge.desktop
+++ b/deluge.desktop
@@ -1,9 +1,9 @@
-[Desktop-Entry]
+[Desktop Entry]
 Encoding=UTF-8
 Name=Deluge BitTorrent Client
-Comment=BitTorrent client in Python/PyGTK
-Exec=deluge
-Icon=deluge.xpm
+Comment=Bittorrent client written in Python/PyGTK
+Exec=deluge-torrent
+Icon=deluge-torrent.xpm
 Terminal=false
 Type=Application
 Categories=Application;Network
diff --git a/setup.py b/setup.py
index 60a07a130..2e79e3b7e 100644
--- a/setup.py
+++ b/setup.py
@@ -80,7 +80,9 @@ deluge_core = Extension('deluge_core',
 										 'libtorrent/src/kademlia/traversal_algorithm.cpp'])
 
 data = [('share/deluge/glade',  glob.glob('glade/*.glade')),
-        ('share/deluge/pixmaps', glob.glob('pixmaps/*.png'))]
+        ('share/deluge/pixmaps', glob.glob('pixmaps/*.png')),
+        ('share/applications' , ['deluge.desktop']),
+        ('share/pixmaps' , ['deluge.xpm'])]
 
 for plugin in glob.glob('plugins/*'):
 	data.append( ('share/deluge/' + plugin, glob.glob(plugin + '/*')) )