diff --git a/bin/bash_shared/defines.sh b/bin/bash_shared/defines.sh
index 67cde98ef..6020ca871 100644
--- a/bin/bash_shared/defines.sh
+++ b/bin/bash_shared/defines.sh
@@ -2,4 +2,6 @@ AZTH_PATH_ROOT=$(readlink -f "$AZTH_PATH_BIN/../")
 
 AZTH_PATH_CONF="$AZTH_PATH_ROOT/conf"
 
+AZTH_PATH_MODULES="$AZTH_PATH_ROOT/modules"
+
 AZTH_PATH_CUSTOM=$(readlink -f "$AZTH_PATH_ROOT/../azth_custom")
diff --git a/bin/bash_shared/includes.sh b/bin/bash_shared/includes.sh
index 11022c609..966e62297 100644
--- a/bin/bash_shared/includes.sh
+++ b/bin/bash_shared/includes.sh
@@ -11,3 +11,14 @@ source "$AZTH_PATH_CONF/config.sh.dist" # "hack" to avoid missing conf variables
 if [ -f "$AZTH_PATH_CONF/config.sh"  ]; then
     source "$AZTH_PATH_CONF/config.sh" # should overwrite previous
 fi
+
+#
+# Load modules
+#
+
+for entry in "$AZTH_PATH_MODULES/"*/include.sh
+do
+    if [ -e $entry ]; then 
+        source $entry
+    fi
+done