diff --git a/configure.ac b/configure.ac
index 1a55eda..3c64302 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,6 +90,8 @@ src/Makefile
 src/include/Makefile
 src/bin/Makefile
 data/Makefile
+data/desktop/Makefile
+data/icon/Makefile
 data/images/Makefile
 data/themes/Makefile
 data/themes/default/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index ed3a550..2c5538a 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,3 +1,3 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = images themes .proto
+SUBDIRS = images themes .proto desktop icon
diff --git a/data/desktop/Makefile.am b/data/desktop/Makefile.am
new file mode 100644
index 0000000..7414f7f
--- /dev/null
+++ b/data/desktop/Makefile.am
@@ -0,0 +1,6 @@
+MAINTAINERCLEANFILES = Makefile.in
+filesdir = $(datadir)/applications
+files_DATA = \
+enventor.desktop
+
+EXTRA_DIST = $(files_DATA)
diff --git a/data/desktop/enventor.desktop b/data/desktop/enventor.desktop
new file mode 100644
index 0000000..867d0af
--- /dev/null
+++ b/data/desktop/enventor.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=Enventor
+Comment=Enlightenment EDC Editor
+Icon=enventor
+Exec=enventor
+Terminal=false
+#MimeType=text/edc
+Categories=Utility;EdcEditor;
diff --git a/data/icon/Makefile.am b/data/icon/Makefile.am
new file mode 100644
index 0000000..8905261
--- /dev/null
+++ b/data/icon/Makefile.am
@@ -0,0 +1,6 @@
+MAINTAINERCLEANFILES = Makefile.in
+filesdir = $(datadir)/icons
+files_DATA = \
+enventor.png
+
+EXTRA_DIST = $(files_DATA)
diff --git a/data/icon/enventor.png b/data/icon/enventor.png
new file mode 100644
index 0000000..af8fd2f
Binary files /dev/null and b/data/icon/enventor.png differ