diff --git a/Makefile b/Makefile
index c8f9c860..6566894b 100644
--- a/Makefile
+++ b/Makefile
@@ -202,6 +202,8 @@ CPPFLAGS += -DOSSOLOG_COMPILE
 CPPFLAGS += -DMCE_VAR_DIR=$(VARDIR)
 CPPFLAGS += -DMCE_RUN_DIR=$(RUNDIR)
 CPPFLAGS += -DPRG_VERSION=$(VERSION)
+# Default module path
+CPPFLAGS += -DMCE_DEFAULT_MCE_MODULE_PATH=$(MODULEDIR)
 
 ifeq ($(strip $(ENABLE_WAKELOCKS)),y)
 CPPFLAGS += -DENABLE_WAKELOCKS
diff --git a/inifiles/mce.ini b/inifiles/mce.ini
index 523892d7..c5cd6362 100644
--- a/inifiles/mce.ini
+++ b/inifiles/mce.ini
@@ -2,10 +2,10 @@
 
 [Modules]
 
-# Path to modules
+# Path to modules, usually architecture dependant
 #
 # Do not modify unless you're sure that you know what you're doing!
-ModulePath=/usr/lib/mce/modules
+#ModulePath=/usr/lib/mce/modules
 
 # Modules
 #
diff --git a/mce-modules.h b/mce-modules.h
index cabc48d1..a282dc6c 100644
--- a/mce-modules.h
+++ b/mce-modules.h
@@ -35,7 +35,7 @@
 #define MCE_CONF_MODULES_MODULES        "Modules"
 
 /** Default value for module path */
-#define DEFAULT_MCE_MODULE_PATH         "/usr/lib/mce/modules"
+#define DEFAULT_MCE_MODULE_PATH         G_STRINGIFY(MCE_DEFAULT_MCE_MODULE_PATH)
 
 void mce_modules_dump_info(void);
 gboolean mce_modules_init(void);