diff --git a/src/freedombone-app-email b/src/freedombone-base-email
similarity index 100%
rename from src/freedombone-app-email
rename to src/freedombone-base-email
diff --git a/src/freedombone-app-tripwire b/src/freedombone-base-tripwire
similarity index 100%
rename from src/freedombone-app-tripwire
rename to src/freedombone-base-tripwire
diff --git a/src/freedombone-vars b/src/freedombone-vars
index 037103b3..f95c4514 100755
--- a/src/freedombone-vars
+++ b/src/freedombone-vars
@@ -80,6 +80,13 @@ do
   source $f
 done
 
+# include base system apps
+BASE_SYSTEM_FILES=$PROJECT_INSTALL_DIR/${PROJECT_NAME}-base-*
+for f in $BASE_SYSTEM_FILES
+do
+  source $f
+done
+
 #include apps
 APP_FILES=$PROJECT_INSTALL_DIR/${PROJECT_NAME}-app-*
 for f in $UTILS_FILES