diff --git a/.gitignore b/.gitignore
index 08c2df0c..a0177025 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,6 +67,10 @@ Temporary Items
 # Ignore changes to the custom css files.
 /css/custom.css
 
+# Ignore users config file but keep the sample.
+/config/*
+!/config/config.js.sample
+
 # Vim
 ## swap
 [._]*.s[a-w][a-z]
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7228c8b6..53d096ae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,7 +24,7 @@ _This release is scheduled to be released on 2021-01-01._
 - Added GitHub workflows for automated testing and changelog enforcement.
 
 ### Updated
-
+- Merging .gitignore in the config-folder with the .gitignore in the root-folder.
 - Weather module - forecast now show TODAY and TOMORROW instead of weekday, to make it easier to understand.
 - Update dependencies to latest versions.
 - Update dependencies eslint, feedme, simple-git and socket.io to latest versions.
diff --git a/config/.gitignore b/config/.gitignore
deleted file mode 100644
index d85e3bd4..00000000
--- a/config/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!config.js.sample