diff --git a/configure.ac b/configure.ac
index 1573d3c..43e81eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -152,6 +152,7 @@ AC_OUTPUT([
 Makefile
 ephoto.spec
 data/Makefile
+data/desktop/Makefile
 data/themes/Makefile
 data/themes/default/Makefile
 data/themes/default/images/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 0166737..c37a4b6 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,2 +1,2 @@
 MAINTAINERCLEANFILES = Makefile.in Makefile
-SUBDIRS = themes
+SUBDIRS = themes desktop
diff --git a/data/desktop/Makefile.am b/data/desktop/Makefile.am
new file mode 100644
index 0000000..b5c8832
--- /dev/null
+++ b/data/desktop/Makefile.am
@@ -0,0 +1,8 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+desktopdir = $(datadir)/applications
+desktop_DATA = ephoto.desktop
+icondir = $(datadir)/pixmaps
+icon_DATA = ephoto.png
+
+EXTRA_DIST = ephoto.desktop ephoto.png
diff --git a/data/desktop/ephoto.desktop b/data/desktop/ephoto.desktop
new file mode 100644
index 0000000..abe0b0a
--- /dev/null
+++ b/data/desktop/ephoto.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Ephoto
+Comment=Enlightened Photo Viewer
+Exec=ephoto
+Icon=ephoto
+Terminal=false
+Type=Application
+Categories=Application;Graphics;Photos;Images;Viewer;
diff --git a/data/desktop/ephoto.png b/data/desktop/ephoto.png
new file mode 100644
index 0000000..1344452
Binary files /dev/null and b/data/desktop/ephoto.png differ