diff --git a/desmume/configure.ac b/desmume/configure.ac
index 4a59de6b9..898679633 100644
--- a/desmume/configure.ac
+++ b/desmume/configure.ac
@@ -140,7 +140,9 @@ AC_CONFIG_FILES([Makefile
                  src/Makefile
                  src/cli/Makefile
                  src/gtk/Makefile
+                 src/gtk/desmume.desktop
                  src/gtk-glade/Makefile
+                 src/gtk-glade/desmume-glade.desktop
                  src/windows/Makefile
 		 autopackage/default.apspec
 ])
diff --git a/desmume/src/gtk-glade/Makefile.am b/desmume/src/gtk-glade/Makefile.am
index 226e7afe5..c2e306281 100644
--- a/desmume/src/gtk-glade/Makefile.am
+++ b/desmume/src/gtk-glade/Makefile.am
@@ -1,3 +1,7 @@
+Applicationsdir = $(datadir)/applications
+Applications_DATA = desmume-glade.desktop
+pixmapdir = $(datadir)/pixmaps
+pixmap_DATA = DeSmuME.xpm
 bin_PROGRAMS = desmume-glade
 desmume_glade_SOURCES =  \
 	globals.h glade-xml.c \
diff --git a/desmume/src/gtk-glade/desmume-glade.desktop.in b/desmume/src/gtk-glade/desmume-glade.desktop.in
new file mode 100644
index 000000000..e8401d1b6
--- /dev/null
+++ b/desmume/src/gtk-glade/desmume-glade.desktop.in
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=@VERSION@
+Type=Application
+Name=DeSmuME
+Comment=Nintento DS emulator
+TryExec=desmume
+Exec=desmume
+Icon=DeSmuME.xpm
+Categories=GNOME;GTK;Application;Game;
diff --git a/desmume/src/gtk/Makefile.am b/desmume/src/gtk/Makefile.am
index f64d3c173..4ff19ed49 100644
--- a/desmume/src/gtk/Makefile.am
+++ b/desmume/src/gtk/Makefile.am
@@ -1,3 +1,7 @@
+Applicationsdir = $(datadir)/applications
+Applications_DATA = desmume.desktop
+pixmapdir = $(datadir)/pixmaps
+pixmap_DATA = DeSmuME.xpm
 EXTRA_DIST = DeSmuME.xpm dev-cpp/desmume.dev dev-cpp/desmume.layout \
 	 dev-cpp/Makefile.win dev-cpp/pthread.h dev-cpp/sched.h \
 	 dev-cpp/semaphore.h
diff --git a/desmume/src/gtk/desmume.desktop.in b/desmume/src/gtk/desmume.desktop.in
new file mode 100644
index 000000000..e8401d1b6
--- /dev/null
+++ b/desmume/src/gtk/desmume.desktop.in
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=@VERSION@
+Type=Application
+Name=DeSmuME
+Comment=Nintento DS emulator
+TryExec=desmume
+Exec=desmume
+Icon=DeSmuME.xpm
+Categories=GNOME;GTK;Application;Game;