diff --git a/README.md b/README.md
index 8e62f210..65d33434 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Docker GitLab
 
-Current Version: 6.5.1
+Current Version: 6.6.0
 
 Dockerfile to build a GitLab container image.
 
diff --git a/resources/setup/config.tar.bz2 b/resources/setup/config.tar.bz2
index 3f4f8765..9662e868 100644
Binary files a/resources/setup/config.tar.bz2 and b/resources/setup/config.tar.bz2 differ
diff --git a/resources/setup/config/gitlabhq/gitlab.yml b/resources/setup/config/gitlabhq/gitlab.yml
index c25982af..1dd32296 100644
--- a/resources/setup/config/gitlabhq/gitlab.yml
+++ b/resources/setup/config/gitlabhq/gitlab.yml
@@ -124,7 +124,7 @@ production: &base
     base: '_the_base_where_you_search_for_users'
     port: 636
     uid: 'sAMAccountName'
-    method: 'ssl' # "ssl" or "plain"
+    method: 'ssl' # "tls" or "ssl" or "plain"
     bind_dn: '_the_full_dn_of_the_user_you_will_bind_with'
     password: '_the_password_of_the_bind_user'
     # If allow_username_or_email_login is enabled, GitLab will ignore everything
@@ -202,7 +202,8 @@ production: &base
   # Use the default values unless you really know what you are doing
   git:
     bin_path: /usr/bin/git
-    # Max size of a git object (e.g. a commit), in bytes
+    # The next value is the maximum memory size grit can use
+    # Given in number of bytes per git object (e.g. a commit)
     # This value can be increased if you have very large commits
     max_size: 5242880 # 5.megabytes
     # Git timeout to read a commit, in seconds
diff --git a/resources/setup/install b/resources/setup/install
index ab98c360..30132cda 100755
--- a/resources/setup/install
+++ b/resources/setup/install
@@ -25,7 +25,7 @@ sudo -u git -H ./bin/install
 
 # install gitlab
 sudo -u git -H mkdir -p /home/git/gitlab
-wget "https://github.com/gitlabhq/gitlabhq/archive/v6.5.1.tar.gz" -O - | tar -zvxf - --strip=1 -C /home/git/gitlab/
+wget "https://github.com/gitlabhq/gitlabhq/archive/v6.6.0.tar.gz" -O - | tar -zvxf - --strip=1 -C /home/git/gitlab/
 chown -R git:git /home/git/gitlab/
 
 cd /home/git/gitlab