@@ -310,7 +310,7 @@ task :setup_github_pages, :repo do |t, args|

   user = repo_url.match(/:([^\/]+)/)[1]

   branch = (repo_url.match(/\/[\w-]+.github.com/).nil?) ? 'gh-pages' : 'master'

   project = (branch == 'gh-pages') ? repo_url.match(/\/([^\.]+)/)[1] : ''

-  unless `git remote -v`.match(/origin.+?octopress.git/).nil?

+  unless `git remote -v`.match(/origin.+?octopress(?:\.git)?/).nil?

     # If octopress is still the origin remote (from cloning) rename it to octopress

     system "git remote rename origin octopress"

     if branch == 'master'