diff --git a/linux/Resources/icon-main.png b/linux/Resources/icon-main.png
new file mode 100644
index 0000000..b0bde46
--- /dev/null
+++ b/linux/Resources/icon-main.png
Binary files differ
diff --git a/linux/chronochat.desktop.in b/linux/chronochat.desktop.in
new file mode 100644
index 0000000..3ff74e5
--- /dev/null
+++ b/linux/chronochat.desktop.in
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Name=ChronoChat
+Keywords=Internet;NDN;Chat
+Exec=@BINDIR@/@BINARY@
+Terminal=false
+X-MultipleArgs=false
+Type=Application
+Icon=@DATAROOTDIR@/chronochat/icon-main.png
+Categories=GNOME;GTK;Network;
+StartupNotify=true
+Actions=NewWindow;NewPrivateWindow;
\ No newline at end of file
diff --git a/wscript b/wscript
index 0443381..56074a5 100644
--- a/wscript
+++ b/wscript
@@ -10,12 +10,18 @@
     
     opt.load('compiler_c compiler_cxx boost protoc qt4')
 
+    if Utils.unversioned_sys_platform () != "darwin":
+        opt.load('gnu_dirs');
+
     # opt.load('tinyxml', tooldir=['waf-tools'])
     opt.load('cryptopp', tooldir=['waf-tools'])
     
 def configure(conf):
     conf.load("compiler_c compiler_cxx boost protoc qt4 cryptopp")
 
+    if Utils.unversioned_sys_platform () != "darwin":
+        conf.load('gnu_dirs');
+
     if conf.options.debug:
         conf.define ('_DEBUG', 1)
         conf.env.DEBUG = 1
@@ -36,6 +42,8 @@
         conf.check_cfg(package='liblog4cxx', args=['--cflags', '--libs'], uselib_store='LOG4CXX', mandatory=True)
     conf.check_cfg (package='ChronoSync', args=['ChronoSync >= 0.1', '--cflags', '--libs'], uselib_store='SYNC', mandatory=True)
 
+    conf.check_cryptopp(path=conf.options.cryptopp_dir)
+
     conf.check_boost(lib='system random thread filesystem')
 
     conf.write_config_header('config.h')
@@ -93,6 +101,15 @@
         qt.mac_app = "ChronoChat.app"
         qt.mac_plist = app_plist % "ChronoChat"
         qt.mac_resources = 'demo.icns'
+    else:
+        bld (features = "subst",
+             source = 'linux/chronochat.desktop.in',
+             target = 'linux/chronochat.desktop',
+             BINARY = "ChronoChat",
+             install_path = "${DATAROOTDIR}/applications"
+            )
+        bld.install_files("${DATAROOTDIR}/chronochat",
+                          bld.path.ant_glob(['linux/Resources/*']))
 
 
 from waflib import TaskGen