diff --git a/Gruntfile.coffee b/Gruntfile.coffee
index f47fa72d7..ad182efc4 100644
--- a/Gruntfile.coffee
+++ b/Gruntfile.coffee
@@ -296,13 +296,13 @@ module.exports = (grunt) ->
 
       serve:
         options:
-          config: "_config.yml,_amsf/_config.yml,<%= config.app %>/_data/<%= amsf.theme.current %>.yml,_config.dev.yml"
+          config: "_config.yml,_amsf/_config.yml,<%= config.app %>/_data/<%= amsf.theme.current %>.yml,_config.dev.yml,_config.user.yml"
           drafts: true
           future: true
 
       dist:
         options:
-          config: "_config.yml,_amsf/_config.yml,<%= config.app %>/_data/<%= amsf.theme.current %>.yml"
+          config: "_config.yml,_amsf/_config.yml,<%= config.app %>/_data/<%= amsf.theme.current %>.yml,_config.user.yml"
           dest: "<%= config.dist %><%= config.base %>"
 
     shell:
diff --git a/_config.user.yml b/_config.user.yml
new file mode 100644
index 000000000..2c329e498
--- /dev/null
+++ b/_config.user.yml
@@ -0,0 +1,3 @@
+#
+# Jekyll user configurations
+#