diff --git a/.gitignore b/.gitignore
index 9c26c10..1fcc764 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,11 @@
 .Trash*
+*.kdev4
+.kdev4/*
+client_software/.sync_*.db
+client_software/setup_system.conf
 config/setup_system.conf
 config/setup_system.conf.bak
 config/skel.tar.zst
 config/.sync_*.db
-client_software/.sync_*.db
-client_software/setup_system.conf
-*.kdev4
-.kdev4/*
+config/.sync_*.db
+config.d/*.conf
diff --git a/README.md b/README.md
index 1644bf1..42fd8cd 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Fedora OEMDRV
 
-an automated massinstallation scripting collection for Fedora and Anakonda
+an automated massinstallation scripting collection for Fedora and Anaconda
 
 IN DEVELOPMENT !
 
diff --git a/config.d/README.md b/config.d/README.md
new file mode 100644
index 0000000..80cea40
--- /dev/null
+++ b/config.d/README.md
@@ -0,0 +1,4 @@
+# Local config Files
+
+You may have .conf files in here, which will be not be touched by anything and will be sourced by the scripts to overwrite any of the settings in setup_system.conf.dist
+The syntax should be same as setup_system.conf.dist
diff --git a/system_setup/setup_system.inc.sh b/system_setup/setup_system.inc.sh
index fa0fa4b..777a9b5 100755
--- a/system_setup/setup_system.inc.sh
+++ b/system_setup/setup_system.inc.sh
@@ -21,6 +21,11 @@ if [ ! -f $(dirname "$0")/../config/setup_system.conf ]; then
 fi
 source $(dirname "$0")/../config/setup_system.conf
 
+#Parse additional client-configs
+if [[ `ls -1 $(dirname "$0")/../config.d/*.conf 2>/dev/null | wc -l ` -gt 0 ]]; then
+    source $(dirname "$0")/../config.d/*.conf
+fi
+
 #Check if the Data- Directory is encrypted
 check_data_isecrypted() {
     CHECKRES=$( cat /etc/mtab | grep "${DECRYPTEDDATADIR}" | grep "fuse.gocryptfs" )