diff --git a/.cvsignore b/.cvsignore
index de7bec7..a32c332 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -21,4 +21,5 @@ stamp-h1
 *.la
 *.spec
 *.tar.gz
-*.edj
+net.edj
+module.desktop
diff --git a/Makefile.am b/Makefile.am
index 77c4d23..fe488df 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,8 @@ EDJE_FLAGS = -v \
 filesdir = $(datadir)
 
 files_DATA = module_icon.png \
-			module.eap \
+			module.desktop \
+			module.edj \
 			net.edj
 
 EXTRA_DIST=$(files_DATA) \
@@ -61,6 +62,6 @@ module_la_DEPENDENCIES = $(top_builddir)/config.h $(top_builddir)/net.edj
 	$(EDJE_CC) $(EDJE_FLAGS) $< $@
 
 clean-local:
-	 rm -rf *.edj *~
+	 rm -rf net.edj *~
 uninstall:
 	  rm -rf $(datadir)
diff --git a/configure.in b/configure.in
index 2f28683..fd030e7 100644
--- a/configure.in
+++ b/configure.in
@@ -149,6 +149,7 @@ AC_SUBST(e_modules)
 AC_OUTPUT([
 Makefile
 e_modules-net.spec
+module.desktop
 po/Makefile
 ],[
 ])
diff --git a/e_mod_config.c b/e_mod_config.c
index de82e4d..d6effde 100644
--- a/e_mod_config.c
+++ b/e_mod_config.c
@@ -38,7 +38,7 @@ _config_net_module (Config_Item * ci)
   v->basic.apply_cfdata = _basic_apply_data;
   v->basic.create_widgets = _basic_create_widgets;
 
-  snprintf (buf, sizeof (buf), "%s/module.eap",
+  snprintf (buf, sizeof (buf), "%s/module.edj",
 	    e_module_dir_get (net_config->module));
   con = e_container_current_get (e_manager_current_get ());
   cfd = e_config_dialog_new (con, D_ ("Net Configuration"), "Net", "_e_modules_net_config_dialog", buf, 0, v, ci);
diff --git a/e_mod_main.c b/e_mod_main.c
index 1e8bb70..777b009 100644
--- a/e_mod_main.c
+++ b/e_mod_main.c
@@ -121,7 +121,7 @@ _gc_icon (Evas * evas)
   char buf[4096];
 
   o = edje_object_add (evas);
-  snprintf (buf, sizeof (buf), "%s/module.eap",
+  snprintf (buf, sizeof (buf), "%s/module.edj",
 	    e_module_dir_get (net_config->module));
   edje_object_file_set (o, buf, "icon");
   return o;
diff --git a/module.desktop.in b/module.desktop.in
new file mode 100644
index 0000000..7d580f1
--- /dev/null
+++ b/module.desktop.in
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=Net
+Exec=enlightenment
+StartupNotify=false
+X-Enlightenment-WaitExit=false
+X-Enlightenment-IconClass=net,gadget
+Icon=./module.edj
diff --git a/module.eap b/module.edj
similarity index 100%
rename from module.eap
rename to module.edj