diff --git a/config/illume-home/e.src b/config/illume-home/e.src
index 82f448a44..c63c97ed4 100644
--- a/config/illume-home/e.src
+++ b/config/illume-home/e.src
@@ -1198,12 +1198,6 @@ group "E_Config" struct {
             value "delayed" uchar: 1;
             value "priority" int: 0;
         }
-        group "E_Config_Module" struct {
-            value "name" string: "conf_profiles";
-            value "enabled" uchar: 1;
-            value "delayed" uchar: 1;
-            value "priority" int: 0;
-        }
         group "E_Config_Module" struct {
             value "name" string: "conf_scale";
             value "enabled" uchar: 1;
diff --git a/config/illume/e.src b/config/illume/e.src
index d73634083..0a0f3ee18 100644
--- a/config/illume/e.src
+++ b/config/illume/e.src
@@ -103,14 +103,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_profiles";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_performance";
diff --git a/config/minimalist/e.src b/config/minimalist/e.src
index 86dd29cc4..b08bb3a30 100644
--- a/config/minimalist/e.src
+++ b/config/minimalist/e.src
@@ -185,14 +185,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_profiles";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_shelves";
diff --git a/config/netbook/e.src b/config/netbook/e.src
index dd970b738..f9c60cf6f 100644
--- a/config/netbook/e.src
+++ b/config/netbook/e.src
@@ -217,14 +217,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_profiles";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_shelves";
diff --git a/config/scaleable/e.src b/config/scaleable/e.src
index 1713817b7..4c371c215 100644
--- a/config/scaleable/e.src
+++ b/config/scaleable/e.src
@@ -120,14 +120,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_profiles";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_performance";
diff --git a/config/standard/e.src b/config/standard/e.src
index 817afa7c6..78a312951 100644
--- a/config/standard/e.src
+++ b/config/standard/e.src
@@ -120,14 +120,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_profiles";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_performance";
diff --git a/configure.ac b/configure.ac
index 32e2a2d99..aab2885c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -687,7 +687,6 @@ AC_E_OPTIONAL_MODULE([conf_mouse_cursor], true)
 AC_E_OPTIONAL_MODULE([conf_transitions], true)
 AC_E_OPTIONAL_MODULE([conf_startup], true)
 AC_E_OPTIONAL_MODULE([conf_intl], true)
-AC_E_OPTIONAL_MODULE([conf_profiles], true)
 AC_E_OPTIONAL_MODULE([msgbus], true)
 AC_E_OPTIONAL_MODULE([conf_applications], true)
 AC_E_OPTIONAL_MODULE([conf_display], true)
@@ -800,8 +799,6 @@ src/modules/conf_startup/Makefile
 src/modules/conf_startup/module.desktop
 src/modules/conf_intl/Makefile
 src/modules/conf_intl/module.desktop
-src/modules/conf_profiles/Makefile
-src/modules/conf_profiles/module.desktop
 src/modules/msgbus/Makefile
 src/modules/msgbus/module.desktop
 src/modules/conf_applications/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 26fa05664..6630b6364 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -137,6 +137,7 @@ src/modules/conf_borders/e_int_config_borders.c
 src/modules/conf_borders/e_mod_main.c
 src/modules/conf_colors/e_int_config_color_classes.c
 src/modules/conf_colors/e_mod_main.c
+src/modules/conf_dialogs/e_int_config_profiles.c
 src/modules/conf_dialogs/e_int_config_dialogs.c
 src/modules/conf_dialogs/e_mod_main.c
 src/modules/conf_display/e_int_config_display.c
@@ -172,8 +173,6 @@ src/modules/conf_paths/e_mod_main.c
 src/modules/conf_performance/e_int_config_engine.c
 src/modules/conf_performance/e_int_config_performance.c
 src/modules/conf_performance/e_mod_main.c
-src/modules/conf_profiles/e_int_config_profiles.c
-src/modules/conf_profiles/e_mod_main.c
 src/modules/conf_scale/e_int_config_scale.c
 src/modules/conf_scale/e_mod_main.c
 src/modules/conf_shelves/e_int_config_shelf.c
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
index dabe4d43d..bc09a1969 100644
--- a/src/modules/Makefile.am
+++ b/src/modules/Makefile.am
@@ -102,10 +102,6 @@ if USE_MODULE_CONF_INTL
 SUBDIRS += conf_intl
 endif
 
-if USE_MODULE_CONF_PROFILES
-SUBDIRS += conf_profiles
-endif
-
 if USE_MODULE_MSGBUS
 SUBDIRS += msgbus
 endif
diff --git a/src/modules/conf_dialogs/Makefile.am b/src/modules/conf_dialogs/Makefile.am
index 5bf34e8d8..e70381000 100644
--- a/src/modules/conf_dialogs/Makefile.am
+++ b/src/modules/conf_dialogs/Makefile.am
@@ -21,7 +21,9 @@ pkg_LTLIBRARIES        = module.la
 module_la_SOURCES      = e_mod_main.c \
                          e_mod_main.h \
 			 e_int_config_dialogs.c \
-                         e_int_config_dialogs.h
+                         e_int_config_dialogs.h \
+                         e_int_config_profiles.c \
+                         e_int_config_profiles.h
 
 module_la_LIBADD       = @e_libs@ @dlopen_libs@
 module_la_LDFLAGS      = -module -avoid-version
diff --git a/src/modules/conf_profiles/e_int_config_profiles.c b/src/modules/conf_dialogs/e_int_config_profiles.c
similarity index 100%
rename from src/modules/conf_profiles/e_int_config_profiles.c
rename to src/modules/conf_dialogs/e_int_config_profiles.c
diff --git a/src/modules/conf_profiles/e_int_config_profiles.h b/src/modules/conf_dialogs/e_int_config_profiles.h
similarity index 100%
rename from src/modules/conf_profiles/e_int_config_profiles.h
rename to src/modules/conf_dialogs/e_int_config_profiles.h
diff --git a/src/modules/conf_dialogs/e_mod_main.c b/src/modules/conf_dialogs/e_mod_main.c
index 9ba06947e..62d847963 100644
--- a/src/modules/conf_dialogs/e_mod_main.c
+++ b/src/modules/conf_dialogs/e_mod_main.c
@@ -16,6 +16,7 @@ e_modapi_init(E_Module *m)
 {
    e_configure_registry_category_add("settings", 80, _("Settings"), NULL, "preferences-system");
    e_configure_registry_item_add("settings/dialogs", 10, _("Dialogs"), NULL, "preferences-system", e_int_config_dialogs);
+   e_configure_registry_item_add("settings/profiles", 50, _("Profiles"), NULL, "preferences-profiles", e_int_config_profiles);
    conf_module = m;
    e_module_delayed_set(m, 1);
    return m;
@@ -25,7 +26,9 @@ EAPI int
 e_modapi_shutdown(E_Module *m __UNUSED__)
 {
    E_Config_Dialog *cfd;
+   while ((cfd = e_config_dialog_get("E", "settings/profiles"))) e_object_del(E_OBJECT(cfd));
    while ((cfd = e_config_dialog_get("E", "settings/dialogs"))) e_object_del(E_OBJECT(cfd));
+   e_configure_registry_item_del("settings/profiles");
    e_configure_registry_item_del("settings/dialogs");
    e_configure_registry_category_del("settings");
    conf_module = NULL;
diff --git a/src/modules/conf_dialogs/e_mod_main.h b/src/modules/conf_dialogs/e_mod_main.h
index 0ecc3c335..e8df8445e 100644
--- a/src/modules/conf_dialogs/e_mod_main.h
+++ b/src/modules/conf_dialogs/e_mod_main.h
@@ -3,9 +3,11 @@
 
 #define E_TYPEDEFS 1
 #include "e_int_config_dialogs.h"
+#include "e_int_config_profiles.h"
 
 #undef E_TYPEDEFS
 #include "e_int_config_dialogs.h"
+#include "e_int_config_profiles.h"
 
 EAPI extern E_Module_Api e_modapi;
 
diff --git a/src/modules/conf_profiles/.cvsignore b/src/modules/conf_profiles/.cvsignore
deleted file mode 100644
index 06d064a84..000000000
--- a/src/modules/conf_profiles/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
diff --git a/src/modules/conf_profiles/Makefile.am b/src/modules/conf_profiles/Makefile.am
deleted file mode 100644
index dd4b856d2..000000000
--- a/src/modules/conf_profiles/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = conf_profiles
-
-# 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_builddir)/src/bin \
-                         -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 \
-			 e_int_config_profiles.c \
-                         e_int_config_profiles.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/conf_profiles/e-module-conf_profiles.edj b/src/modules/conf_profiles/e-module-conf_profiles.edj
deleted file mode 100644
index f6bb9c8c5..000000000
Binary files a/src/modules/conf_profiles/e-module-conf_profiles.edj and /dev/null differ
diff --git a/src/modules/conf_profiles/e_mod_main.c b/src/modules/conf_profiles/e_mod_main.c
deleted file mode 100644
index b57b694f4..000000000
--- a/src/modules/conf_profiles/e_mod_main.c
+++ /dev/null
@@ -1,44 +0,0 @@
-#include "e.h"
-#include "e_mod_main.h"
-
-/* actual module specifics */
-static E_Module *conf_module = NULL;
-
-/* module setup */
-EAPI E_Module_Api e_modapi =
-{
-   E_MODULE_API_VERSION,
-     "Settings - Profiles"
-};
-
-EAPI void *
-e_modapi_init(E_Module *m)
-{
-   e_configure_registry_category_add("settings", 80, _("Settings"),
-				     NULL, "preferences-system");
-   e_configure_registry_item_add("settings/profiles", 50, _("Profiles"),
-				 NULL, "preferences-profiles",
-				 e_int_config_profiles);
-   conf_module = m;
-   e_module_delayed_set(m, 1);
-   return m;
-}
-
-EAPI int
-e_modapi_shutdown(E_Module *m __UNUSED__)
-{
-   E_Config_Dialog *cfd;
-
-   while ((cfd = e_config_dialog_get("E", "settings/profiles")))
-     e_object_del(E_OBJECT(cfd));
-   e_configure_registry_item_del("settings/profiles");
-   e_configure_registry_category_del("settings");
-   conf_module = NULL;
-   return 1;
-}
-
-EAPI int
-e_modapi_save(E_Module *m __UNUSED__)
-{
-   return 1;
-}
diff --git a/src/modules/conf_profiles/e_mod_main.h b/src/modules/conf_profiles/e_mod_main.h
deleted file mode 100644
index d4487f2e1..000000000
--- a/src/modules/conf_profiles/e_mod_main.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef E_MOD_MAIN_H
-#define E_MOD_MAIN_H
-
-#define E_TYPEDEFS 1
-#include "e_int_config_profiles.h"
-
-#undef E_TYPEDEFS
-#include "e_int_config_profiles.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/conf_profiles/module.desktop.in b/src/modules/conf_profiles/module.desktop.in
deleted file mode 100644
index 6b6730756..000000000
--- a/src/modules/conf_profiles/module.desktop.in
+++ /dev/null
@@ -1,34 +0,0 @@
-[Desktop Entry]
-Type=Link
-Name=Profiles
-Name[ru]=Профили
-Name[cs]=Profily
-Name[de]=
-Name[eo]=Profiloj
-Name[es]=Perfiles
-Name[fr]=Profils
-Name[hu]=Profilok
-Name[it]=Profili
-Name[ja]=
-Name[pt]=Perfis
-Name[pt_BR]=
-Name[tr]=Profiller
-Name[zh_CN]=
-Name[zh_TW]=
-Icon=e-module-conf_profiles
-Comment=Allows management of configuration profiles.
-Comment[ru]=Позволяет управлять конфигурацией профилей.
-Comment[cs]=Správa profilů.
-Comment[de]=
-Comment[eo]=Administri agordajn profilojn.
-Comment[es]=Permite la administración de perfiles de configuración.
-Comment[fr]=Gestionnaire des profils.
-Comment[hu]=Lehetőséged van különböző profilok beállítására.
-Comment[it]=Consente la gestione dei profili di configurazione.
-Comment[ja]=
-Comment[pt]=Permite-lhe configurar os perfis
-Comment[pt_BR]=
-Comment[tr]=Profillerin yapılandırmasını yönetir.
-Comment[zh_CN]=
-Comment[zh_TW]=
-X-Enlightenment-ModuleType=settings