diff --git a/.gitignore b/.gitignore
index a5bc27bf..c0a13c86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
 .bundle
 .gh-pages
+.thoughtbot-gh-pages
+.mcmire-gh-pages
 .yardoc
 coverage
 build
diff --git a/tasks/documentation.rb b/tasks/documentation.rb
index 1c11e752..b1624758 100644
--- a/tasks/documentation.rb
+++ b/tasks/documentation.rb
@@ -57,10 +57,10 @@ module Shoulda
 
     class DocumentationPublisher
       CURRENT_VERSION = Shoulda::Matchers::VERSION
-      GH_PAGES_DIR = '.gh-pages'
-      DOCS_DIR = "#{GH_PAGES_DIR}/docs"
       GITHUB_USERNAME = 'thoughtbot'
       # GITHUB_USERNAME = 'mcmire'
+      GH_PAGES_DIR = ".#{GITHUB_USERNAME}-gh-pages"
+      DOCS_DIR = "#{GH_PAGES_DIR}/docs"
 
       def self.current_version
         CURRENT_VERSION