diff --git a/sflphone-gtk/Makefile.am b/sflphone-gtk/Makefile.am
index 3549f3d0260e91ca918bacc7e74450b5744c7528..bb84e4e1ec49dc74f4fc338b6c4e6f743ab70275 100644
--- a/sflphone-gtk/Makefile.am
+++ b/sflphone-gtk/Makefile.am
@@ -1,2 +1,9 @@
 SUBDIRS = src pixmaps
 
+EXTRA_DIST   = sflphone.desktop.in 
+appsdir = $(datadir)/applications
+apps_in_files = sflphone.desktop.in
+apps_DATA = $(apps_in_files:.desktop.in=.desktop)
+#@INTLTOOL_DESKTOP_RULE@
+
+DISTCLEANFILES= sflphone.desktop
diff --git a/sflphone-gtk/configure.ac b/sflphone-gtk/configure.ac
index c87e6f7e0280a686a29f3e19adaa700088fe1234..79d3e6a4ea13beb787fccbe014f9c4f1180d9bcb 100644
--- a/sflphone-gtk/configure.ac
+++ b/sflphone-gtk/configure.ac
@@ -36,6 +36,7 @@ AC_OUTPUT([
 Makefile 
 src/Makefile 
 pixmaps/Makefile
+sflphone.desktop
 ])
 
 
diff --git a/sflphone-gtk/pixmaps/Makefile.am b/sflphone-gtk/pixmaps/Makefile.am
index 980d564221accdad36e58468368cb36274ac3771..5cc6713898b5cfde0d403048b01f1b14e33a60f9 100644
--- a/sflphone-gtk/pixmaps/Makefile.am
+++ b/sflphone-gtk/pixmaps/Makefile.am
@@ -1,3 +1,6 @@
-pixmapsdir   = $(datadir)/pixmaps
-pixmaps_DATA = sflphone.png accept.svg current.svg transfert.svg hang_up.svg hold.svg unhold.svg refuse.svg call.svg ring.svg dial.svg mic.svg speaker.svg fail.svg
-EXTRA_DIST   = $(pixmaps_DATA)
+icondir   = $(datadir)/pixmaps
+icon_DATA = sflphone.png 
+
+buttons_DATA = accept.svg current.svg transfert.svg hang_up.svg hold.svg unhold.svg refuse.svg call.svg ring.svg dial.svg mic.svg speaker.svg fail.svg
+buttonsdir   = $(datadir)/sflphone
+EXTRA_DIST   = $(icon_DATA) $(buttons_DATA) 
diff --git a/sflphone-gtk/sflphone.desktop.in b/sflphone-gtk/sflphone.desktop.in
new file mode 100644
index 0000000000000000000000000000000000000000..bb6200929ee6abc49f35eb931a6c4bae4ede648a
--- /dev/null
+++ b/sflphone-gtk/sflphone.desktop.in
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=SFLphone VOIP client
+GenericName=Telephone
+Comment=Call and receive calls with SIP or IAX protocols
+Exec=sflphone-gtk
+Icon=sflphone.png
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=Network;Telephony;
diff --git a/sflphone-gtk/src/Makefile.am b/sflphone-gtk/src/Makefile.am
index a14e740eff60fa59e50acc9d5e3cf45a8c76fa66..ecd4fa2380a19fd4c22ddc0aac76e84a5229e7e4 100644
--- a/sflphone-gtk/src/Makefile.am
+++ b/sflphone-gtk/src/Makefile.am
@@ -23,4 +23,4 @@ EXTRA_DIST   = marshaller.list
 sflphone_gtk_LDADD = $(DEPS_LIBS)
 
 AM_CPPFLAGS = $(DEPS_CFLAGS) \
-              -DPIXMAPS_DIR=\""$(datadir)/pixmaps"\"
+              -DICONS_DIR=\""$(datadir)/sflphone"\"