diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
index a6dc651d7..54c9b9542 100644
--- a/src/modules/Makefile.am
+++ b/src/modules/Makefile.am
@@ -239,7 +239,7 @@ SUBDIRS += connman
 endif
 
 if USE_MODULE_ILLUME
-SUBDIRS += illume illume2
+SUBDIRS += illume illume2 illume-home
 endif
 
 if USE_MODULE_SYSCON
@@ -317,6 +317,7 @@ mixer \
 connman \
 illume \
 illume2 \
+illume-home \
 syscon \
 everything \
 systray
diff --git a/src/modules/illume-home/Makefile.am b/src/modules/illume-home/Makefile.am
new file mode 100644
index 000000000..a80d63ee8
--- /dev/null
+++ b/src/modules/illume-home/Makefile.am
@@ -0,0 +1,29 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = illume-home
+
+# data files for the module
+filesdir = $(libdir)/enlightenment/modules/$(MODULE)
+files_DATA = \
+e-module-$(MODULE).edj module.desktop
+
+EXTRA_DIST = $(files_DATA)
+
+# the module .so file
+INCLUDES               = -I. \
+                         -I$(top_srcdir) \
+                         -I$(top_srcdir)/src/modules/$(MODULE) \
+                         -I$(top_srcdir)/src/bin \
+                         -I$(top_srcdir)/src/lib \
+                         -I$(top_srcdir)/src/modules \
+                         @e_cflags@
+pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
+pkg_LTLIBRARIES        = module.la
+module_la_SOURCES      = e_mod_main.c \
+                         e_mod_main.h
+
+module_la_LIBADD       = @e_libs@ @dlopen_libs@
+module_la_LDFLAGS      = -module -avoid-version
+module_la_DEPENDENCIES = $(top_builddir)/config.h
+
+uninstall:
+	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/illume-home/e-module-illume-home.edj b/src/modules/illume-home/e-module-illume-home.edj
new file mode 100644
index 000000000..8a32ce34a
Binary files /dev/null and b/src/modules/illume-home/e-module-illume-home.edj differ
diff --git a/src/modules/illume-home/e_mod_main.c b/src/modules/illume-home/e_mod_main.c
new file mode 100644
index 000000000..ab3f17c30
--- /dev/null
+++ b/src/modules/illume-home/e_mod_main.c
@@ -0,0 +1,282 @@
+#include "e.h"
+
+#define IL_HOME_WIN_TYPE 0xE0b0102f
+
+/* local structures */
+typedef struct _Instance Instance;
+typedef struct _Il_Home_Win Il_Home_Win;
+
+struct _Instance 
+{
+   E_Gadcon_Client *gcc;
+   Evas_Object *o_btn;
+   E_Menu *menu;
+   Il_Home_Win *hwin;
+};
+struct _Il_Home_Win 
+{
+   E_Object e_obj_inherit;
+
+   E_Win *win;
+   Evas_Object *o_bg;
+};
+
+/* local function prototypes */
+static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
+static void _gc_shutdown(E_Gadcon_Client *gcc);
+static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
+static char *_gc_label(E_Gadcon_Client_Class *cc);
+static Evas_Object *_gc_icon(E_Gadcon_Client_Class *cc, Evas *evas);
+static const char *_gc_id_new(E_Gadcon_Client_Class *cc);
+
+static void _il_home_btn_cb_click(void *data, void *data2);
+static void _il_home_btn_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event);
+static void _il_home_menu_cb_post(void *data, E_Menu *mn);
+
+static void _il_home_win_new(Il_Home_Win *hwin);
+static void _il_home_win_cb_free(Il_Home_Win *hwin);
+static void _il_home_win_cb_delete(E_Win *win);
+static void _il_home_win_cb_resize(E_Win *win);
+
+/* local variables */
+static Eina_List *instances = NULL;
+static E_Module *mod;
+
+static const E_Gadcon_Client_Class _gc_class = 
+{
+   GADCON_CLIENT_CLASS_VERSION, "illume-home", 
+     { _gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon, _gc_id_new, NULL, 
+          e_gadcon_site_is_not_toolbar
+     }, E_GADCON_CLIENT_STYLE_PLAIN
+};
+
+/* public functions */
+EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Illume Home" };
+
+EAPI void *
+e_modapi_init(E_Module *m) 
+{
+   mod = m;
+   e_gadcon_provider_register(&_gc_class);
+   return m;
+}
+
+EAPI int 
+e_modapi_shutdown(E_Module *m) 
+{
+   e_gadcon_provider_unregister(&_gc_class);
+   mod = NULL;
+   return 1;
+}
+
+EAPI int 
+e_modapi_save(E_Module *m) 
+{
+   return 1;
+}
+
+/* local functions */
+static E_Gadcon_Client *
+_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style) 
+{
+   Instance *inst;
+   Evas_Object *icon;
+   char buff[PATH_MAX];
+
+   snprintf(buff, sizeof(buff), "%s/e-module-illume-home.edj", mod->dir);
+   inst = E_NEW(Instance, 1);
+   inst->o_btn = e_widget_button_add(gc->evas, NULL, NULL, 
+                                     _il_home_btn_cb_click, inst, NULL);
+   icon = e_icon_add(evas_object_evas_get(inst->o_btn));
+   e_icon_file_edje_set(icon, buff, "btn_icon");
+   e_widget_button_icon_set(inst->o_btn, icon);
+
+   inst->gcc = e_gadcon_client_new(gc, name, id, style, inst->o_btn);
+   inst->gcc->data = inst;
+
+   evas_object_event_callback_add(inst->o_btn, EVAS_CALLBACK_MOUSE_DOWN, 
+                                  _il_home_btn_cb_mouse_down, inst);
+
+   instances = eina_list_append(instances, inst);
+   return inst->gcc;
+}
+
+static void 
+_gc_shutdown(E_Gadcon_Client *gcc) 
+{
+   Instance *inst;
+
+   if (!(inst = gcc->data)) return;
+   instances = eina_list_remove(instances, inst);
+   if (inst->menu) 
+     {
+        e_menu_post_deactivate_callback_set(inst->menu, NULL, NULL);
+        e_object_del(E_OBJECT(inst->menu));
+        inst->menu = NULL;
+     }
+   if (inst->o_btn) 
+     {
+        evas_object_event_callback_del(inst->o_btn, EVAS_CALLBACK_MOUSE_DOWN, 
+                                       _il_home_btn_cb_mouse_down);
+        evas_object_del(inst->o_btn);
+     }
+   if (inst->hwin) e_object_del(E_OBJECT(inst->hwin));
+   E_FREE(inst);
+}
+
+static void 
+_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient) 
+{
+   e_gadcon_client_aspect_set(gcc, 16, 16);
+   e_gadcon_client_min_size_set(gcc, 16, 16);
+}
+
+static char *
+_gc_label(E_Gadcon_Client_Class *cc) 
+{
+   return "Illume-Home";
+}
+
+static Evas_Object *
+_gc_icon(E_Gadcon_Client_Class *cc, Evas *evas) 
+{
+   Evas_Object *o;
+   char buff[PATH_MAX];
+
+   snprintf(buff, sizeof(buff), "%s/e-module-illume-home.edj", mod->dir);
+   o = edje_object_add(evas);
+   edje_object_file_set(o, buff, "icon");
+   return o;
+}
+
+static const char *
+_gc_id_new(E_Gadcon_Client_Class *cc) 
+{
+   char buff[PATH_MAX];
+
+   snprintf(buff, sizeof(buff), "%s.%d", _gc_class.name, 
+            eina_list_count(instances));
+   return strdup(buff);
+}
+
+static void 
+_il_home_btn_cb_click(void *data, void *data2) 
+{
+   Instance *inst;
+
+   if (!(inst = data)) return;
+   if (!inst->hwin) 
+     {
+        inst->hwin = E_OBJECT_ALLOC(Il_Home_Win, IL_HOME_WIN_TYPE, 
+                                    _il_home_win_cb_free);
+     }
+   if (!inst->hwin) return;
+   _il_home_win_new(inst->hwin);
+}
+
+static void 
+_il_home_btn_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event) 
+{
+   Instance *inst;
+   Evas_Event_Mouse_Down *ev;
+
+   if (!(inst = data)) return;
+   ev = event;
+   if (ev->button == 1) return;
+   if ((ev->button == 3) && (!inst->menu)) 
+     {
+        E_Menu *mn;
+        E_Zone *zone;
+        int x = 0, y = 0;
+
+        zone = e_util_zone_current_get(e_manager_current_get());
+        mn = e_menu_new();
+        inst->menu = mn;
+        e_menu_post_deactivate_callback_set(inst->menu, 
+                                            _il_home_menu_cb_post, inst);
+        e_gadcon_client_util_menu_items_append(inst->gcc, mn, 0);
+        e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &x, &y, NULL, NULL);
+        e_menu_activate_mouse(mn, zone, x + ev->output.x, y + ev->output.y, 
+                              1, 1, E_MENU_POP_DIRECTION_AUTO, ev->timestamp);
+     }
+}
+
+static void 
+_il_home_menu_cb_post(void *data, E_Menu *mn) 
+{
+   Instance *inst;
+
+   if (!(inst = data)) return;
+   if (!inst->menu) return;
+   e_object_del(E_OBJECT(inst->menu));
+   inst->menu = NULL;
+}
+
+static void 
+_il_home_win_new(Il_Home_Win *hwin) 
+{
+   E_Container *con;
+
+   if (!hwin) return;
+   if (hwin->win) 
+     {
+        e_win_show(hwin->win);
+        return;
+     }
+
+   con = e_container_current_get(e_manager_current_get());
+
+   hwin->win = e_win_new(con);
+   if (!hwin->win) return;
+
+   e_win_delete_callback_set(hwin->win, _il_home_win_cb_delete);
+   e_win_resize_callback_set(hwin->win, _il_home_win_cb_resize);
+   hwin->win->data = hwin;
+
+   hwin->o_bg = edje_object_add(e_win_evas_get(hwin->win));
+   if (!e_theme_edje_object_set(hwin->o_bg, "base/theme/modules/illume-home", 
+                           "modules/illume-home/window")) 
+     {
+        char buff[PATH_MAX];
+
+        snprintf(buff, sizeof(buff), "%s/e-module-illume-home.edj", mod->dir);
+        edje_object_file_set(hwin->o_bg, buff, "modules/illume-home/window");
+     }
+   evas_object_show(hwin->o_bg);
+
+   e_win_title_set(hwin->win, "Illume Home");
+   e_win_name_class_set(hwin->win, "Illume-Home", "Home");
+   e_win_size_min_set(hwin->win, 24, 24);
+   e_win_resize(hwin->win, 200, 200);
+   e_win_show(hwin->win);
+}
+
+static void 
+_il_home_win_cb_free(Il_Home_Win *hwin) 
+{
+   if (hwin->win) e_object_del(E_OBJECT(hwin->win));
+   e_object_del(E_OBJECT(hwin));
+}
+
+static void 
+_il_home_win_cb_delete(E_Win *win) 
+{
+   Il_Home_Win *hwin;
+
+   hwin = win->data;
+   e_object_del(E_OBJECT(hwin));
+}
+
+static void 
+_il_home_win_cb_resize(E_Win *win) 
+{
+   Il_Home_Win *hwin;
+
+   hwin = win->data;
+   if (hwin->o_bg) 
+     {
+        if (hwin->win)
+          evas_object_resize(hwin->o_bg, 
+                             hwin->win->w, hwin->win->h);
+     }
+}
diff --git a/src/modules/illume-home/e_mod_main.h b/src/modules/illume-home/e_mod_main.h
new file mode 100644
index 000000000..f884cc0aa
--- /dev/null
+++ b/src/modules/illume-home/e_mod_main.h
@@ -0,0 +1,10 @@
+#ifndef E_MOD_MAIN_H
+#define E_MOD_MAIN_H
+
+EAPI extern E_Module_Api e_modapi;
+
+EAPI void *e_modapi_init(E_Module *m);
+EAPI int e_modapi_shutdown(E_Module *m);
+EAPI int e_modapi_save(E_Module *m);
+
+#endif
diff --git a/src/modules/illume-home/module.desktop.in b/src/modules/illume-home/module.desktop.in
new file mode 100644
index 000000000..439e59379
--- /dev/null
+++ b/src/modules/illume-home/module.desktop.in
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Link
+Name=Illume-Home
+Icon=e-module-illume-home
+X-Enlightenment-ModuleType=system
+Comment=<title>Illume Home for Embedded</title>