diff --git a/lib/rhc/commands/git_clone.rb b/lib/rhc/commands/git_clone.rb
index 494a4350c..2fa2eeccf 100644
--- a/lib/rhc/commands/git_clone.rb
+++ b/lib/rhc/commands/git_clone.rb
@@ -23,7 +23,7 @@ def run(app_name)
 
         0
       else
-        error "You do not have git installed. In order to fully interact with OpenShift you will need to install and configure a git client.#{RHC::Helpers.windows? ? ' We recommend this free application: Git for Windows - a basic git command line and GUI client http://msysgit.github.io/.' : ''}"
+        error "You do not have git installed. In order to fully interact with OpenShift you will need to install and configure a git client.#{RHC::Helpers.windows? ? ' We recommend this free application: Git for Windows - a basic git command line and GUI client https://git-for-windows.github.io/.' : ''}"
         2
       end
     end
diff --git a/lib/rhc/ssh_helpers.rb b/lib/rhc/ssh_helpers.rb
index 69207ec62..eef0117f1 100644
--- a/lib/rhc/ssh_helpers.rb
+++ b/lib/rhc/ssh_helpers.rb
@@ -461,9 +461,11 @@ def discover_ssh_executable
           # looks for ssh.exe from msysgit or plink.exe from PuTTY, either on path or specific locations
           guessing_locations <<
             discover_windows_executables do |base|
-              [
+              from_path = ENV['PATH'].split(File::PATH_SEPARATOR).map {|p| p + File::ALT_SEPARATOR + "ssh.exe" }
+              from_path + [
                 'ssh.exe',
                 "#{base}\\Git\\bin\\ssh.exe",
+                "#{base}\\Git\\usr\\bin\\ssh.exe",
                 "#{base}\\ssh.exe",
                 'plink.exe',
                 "#{base}\\PuTTY\\plink.exe",
@@ -495,7 +497,7 @@ def discover_ssh_executable
     def check_ssh_executable!(path)
       if not path
         discover_ssh_executable.tap do |ssh_cmd|
-          raise RHC::InvalidSSHExecutableException.new("No system SSH available. Please use the --ssh option to specify the path to your SSH executable, or install SSH.#{windows? ? ' We recommend this free application: Git for Windows - a basic git command line and GUI client http://msysgit.github.io/.' : ''}") unless ssh_cmd or has_ssh?
+          raise RHC::InvalidSSHExecutableException.new("No system SSH available. Please use the --ssh option to specify the path to your SSH executable, or install SSH.#{windows? ? ' We recommend this free application: Git for Windows - a basic git command line and GUI client https://git-for-windows.github.io/.' : ''}") unless ssh_cmd or has_ssh?
         end
       else
         bin_path = split_path(path)[0]
diff --git a/lib/rhc/wizard.rb b/lib/rhc/wizard.rb
index 73d2b58c7..8efcb350f 100644
--- a/lib/rhc/wizard.rb
+++ b/lib/rhc/wizard.rb
@@ -631,7 +631,7 @@ def windows_install
 
 We recommend these free applications:
 
-  * Git for Windows - a basic git command line and GUI client http://msysgit.github.io/
+  * Git for Windows - a basic git command line and GUI client https://git-for-windows.github.io/
   * TortoiseGit - git client that integrates into the file explorer http://code.google.com/p/tortoisegit/
  
 EOF