diff --git a/Changelog.md b/Changelog.md
index 2a8d864e..34692b4f 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,9 @@
 
 This file only reflects the changes that are made in the the docker image. Please refer to the upstream GitLab [CHANGELOG](https://github.com/gitlabhq/gitlabhq/blob/master/CHANGELOG) for the list of changes in GitLab.
 
+**latest**
+- gitlab-shell: upgrade to v.2.6.4
+
 **7.13.5**
 - gitlab: upgrade to CE v.7.13.5
 
diff --git a/Dockerfile b/Dockerfile
index 7a5571f4..18c61d6f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM sameersbn/ubuntu:14.04.20150816
 MAINTAINER sameer@damagehead.com
 
 ENV GITLAB_VERSION=7.13.5 \
-    GITLAB_SHELL_VERSION=2.6.3 \
+    GITLAB_SHELL_VERSION=2.6.4 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/assets/config/gitlab-shell/config.yml b/assets/config/gitlab-shell/config.yml
index 4cf6059d..0bdbd707 100644
--- a/assets/config/gitlab-shell/config.yml
+++ b/assets/config/gitlab-shell/config.yml
@@ -1,3 +1,8 @@
+#
+# If you change this file in a Merge Request, please also create
+# a Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
+#
+
 # GitLab user. git by default
 user: git