diff --git a/Makefile b/Makefile
index 6f415786..d49f63fc 100755
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,7 @@ source:
 	tar -cvzf ../$(APP)_$(VERSION).orig.tar.gz ../$(APP)-$(VERSION) --exclude-vcs
 
 install:
+	mkdir -m 755 -p $(DESTDIR)/usr/bin
 	mkdir -m 755 -p $(DEST_APP)
 	mkdir -m 755 -p $(DEST_SHARE)/applications
 	mkdir -m 755 -p $(DEST_APP)/images
@@ -34,7 +35,7 @@ install:
 	install -m 644 src/pyelliptic/*.py $(DEST_APP)/pyelliptic
 	install -m 644 src/socks/*.py $(DEST_APP)/socks
 	install -m 644 src/bitmessageqt/*.py $(DEST_APP)/bitmessageqt
-	install -m 755 debian/pybm /usr/bin/pybitmessage
+	install -m 755 debian/pybm $(DESTDIR)/usr/bin/$(APP)
 
 	install -m 644 desktop/$(APP).desktop $(DEST_SHARE)/applications/$(APP).desktop
 	install -m 644 src/images/can-icon-24px.png $(DEST_SHARE)/icons/hicolor/24x24/apps/$(APP).png
diff --git a/desktop/pybitmessage.desktop b/desktop/pybitmessage.desktop
index 363908dd..2b1b6902 100644
--- a/desktop/pybitmessage.desktop
+++ b/desktop/pybitmessage.desktop
@@ -7,12 +7,12 @@ Comment=Send encrypted messages to another person or to many subscribers
 Exec=pybitmessage %U
 Icon=pybitmessage
 Terminal=false
-Categories=Network;Email;Application
-Keywords=Email;E-mail;Newsgroup;Messaging
+Categories=Network;Email;Application;
+Keywords=Email;E-mail;Newsgroup;Messaging;
 X-MessagingMenu-UsesChatSection=true
 X-Ubuntu-Gettext-Domain=pybitmessage
 
-Actions=Send;Subscribe;AddressBook
+Actions=Send;Subscribe;AddressBook;
 
 [Desktop Action Send]
 Name=Send
@@ -27,4 +27,4 @@ OnlyShowIn=Unity;
 [Desktop Action AddressBook]
 Name=Address Book
 Exec=pybitmessage -a
-OnlyShowIn=Unity;
\ No newline at end of file
+OnlyShowIn=Unity;