diff --git a/.gitignore b/.gitignore
index ecb483e8..9b851b18 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,9 @@ jspm_modules
 .npm
 .node_repl_history
 
+# Visual Studio Code ignoramuses.
+.vscode/
+
 # Various Windows ignoramuses.
 Thumbs.db
 ehthumbs.db
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 592a521f..90bae37b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 - Add `clientonly` script to start only the electron client for a remote server.
 - Add symbol and color properties of event when `CALENDAR_EVENTS` notification is broadcasted from `default/calendar` module.
+- Add `.vscode/` folder to `.gitignore` to keep custom Visual Studio Code config out of git
 
 ### Updated
 - Changed 'default.js' - listen on all attached interfaces by default