diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..496f4d8
--- /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/README.md b/README.md
index e0ea477..01b8ea1 100644
--- a/README.md
+++ b/README.md
@@ -32,11 +32,10 @@ If you are using the frozen executable package available from the download page
 ## Supported players
 ### mplayer2 on Linux
 
-On Linux `syncplayClient.py` acts as a wrapper for mplayer. 
-You're expected to pass filename as the first positional argument. If you wish to pass more arguments to mplayer prepend them with -- argument, it's treated as the last argument for wrapper.
-It launches mplayer which behaves just like normal (it reacts to keyboard shortcuts etc).
+On Linux `syncplay` acts as a front-end for mplayer2. 
+To use it select "Open with..." in context menu and choose `Syncplay` or from command line: "syncplay video_filename". If you wish to pass more arguments to mplayer2 prepend them with -- argument, it's treated as the last argument for wrapper.
 
-Default mplayer output is suppressed, but if mplayer quits with errors, those errors will be printed (at most 50 last lines).
+Default mplayer2 output is suppressed, but if mplayer2 quits with errors, those errors will be printed (at most 50 last lines).
 
 ### Media Player Classic - Home Cinema (MPC-HC) on Windows
 
@@ -62,11 +61,19 @@ On Windows simply running `syncplayClient.exe` opens a Syncplay command-line win
 
 ### Getting started with Syncplay on Linux
 
-* [Instructions not written yet.]
+1. Ensure that you have an up to date version of `mplayer2` installed.
+
+2. Download Syncplay tarball from https://github.com/Uriziel/syncplay/downloads and run `make install`.
+
+3. Open the media file you wish to play with `syncplay` (e.g. using "Open with...").
+
+4. Enter configuration settings (see "Configuration window", below). Ensure that you are on the same server and room as your fellow viewers.
+
+5. Playing, pausing and seeking from within the mplayer2 instance should now be synchronised with everyone else in the same 'room'.
 
 ### Opening a media file with Syncplay
 
-Opening a file with `syncplayClient` will automatically run Syncplay and load the file through MPC-HC on Windows or mplayer on Linux.
+Opening a file with `syncplayClient` (`Syncplay` on Linux) will automatically run Syncplay and load the file through MPC-HC on Windows or mplayer2 on Linux.
 
 ### Configuration window
 The configuration window allows for various settings to be configured prior to Syncplay starting.
@@ -158,4 +165,4 @@ You might also be able to discuss your problem through Internet Relay Chat (IRC)
 
 ### Known issues
 1. Changing your system time while Syncplay is running confuses the sync. PROTIP: Don't do it.
-2. Syncplay cannot properly handle a seek that is within 8 seconds of the current position. PROTIP: Don't do it.
\ No newline at end of file
+2. Syncplay cannot properly handle a seek that is within 8 seconds of the current position. PROTIP: Don't do it.
diff --git a/syncplay.desktop b/syncplay.desktop
index ce7c285..79e8809 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
+MimeType=audio/ac3;audio/mp4;audio/mpeg;audio/vnd.rn-realaudio;audio/vorbis;audio/x-adpcm;audio/x-matroska;audio/x-mp2;audio/x-mp3;audio/x-ms-wma;audio/x-vorbis;audio/x-wav;audio/mpegurl;audio/x-mpegurl;audio/x-pn-realaudio;audio/x-scpls;video/avi;video/mp4;video/flv;video/mpeg;video/quicktime;video/vnd.rn-realvideo;video/x-matroska;video/x-ms-asf;video/x-msvideo;video/x-ms-wmv;video/x-ogm;video/x-theora;
+NoDisplay=true