diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..a429446
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,20 @@
+BIN_PATH          = /usr/bin
+LIB_PATH          = /usr/lib
+APP_SHORTCUT_PATH = /usr/share/applications
+ICON_PATH         = /usr/share/icons
+
+install:
+	touch $(BIN_PATH)/syncplay
+	echo '#!/bin/sh\npython $(LIB_PATH)/syncplay/syncplayClient.py $$@' > $(BIN_PATH)/syncplay
+	chmod a+x $(BIN_PATH)/syncplay
+	mkdir $(LIB_PATH)/syncplay/
+	cp syncplayClient.py $(LIB_PATH)/syncplay/
+	cp -r syncplay $(LIB_PATH)/syncplay/
+	cp syncplay.desktop $(APP_SHORTCUT_PATH)/
+	cp icon2.ico $(ICON_PATH)/
+
+uninstall:
+	rm $(BIN_PATH)/syncplay
+	rm -rf $(LIB_PATH)/syncplay
+	rm $(APP_SHORTCUT_PATH)/syncplay.desktop
+	rm $(ICON_PATH)/icon2.ico
diff --git a/syncplay.desktop b/syncplay.desktop
index ce7c285..445468f 100755
--- a/syncplay.desktop
+++ b/syncplay.desktop
@@ -1,13 +1,11 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Syncplay
-Name[pl]=Syncplay
 Comment=Synchronize video playback over network
-Comment[pl]=Synchronizacja odtwarzania wideo przez sieć
-Exec=/opt/syncplay/syncplayClient.py %u
+Exec=/usr/bin/syncplay %u
 Terminal=true
 Type=Application
-Icon=/opt/syncplay/icon2.ico
+Icon=/usr/share/icons/icon2.ico
 Categories=AudioVideo;Audio;Video;Player;Network;
 MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;video/msvideo;video/x-msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/x-fli;video/x-theora;video/x-matroska;video/3gpp;application/x-flash-video;
-StartupWMClass=Syncplay
+NoDisplay=true