diff --git a/var/spack/repos/builtin/packages/amg/package.py b/var/spack/repos/builtin/packages/amg/package.py
index f2745ed26d..271c1ba0fc 100644
--- a/var/spack/repos/builtin/packages/amg/package.py
+++ b/var/spack/repos/builtin/packages/amg/package.py
@@ -33,7 +33,7 @@ class Amg(MakefilePackage):
     tags = ['proxy-app', 'ecp-proxy-app']
 
     homepage = "https://codesign.llnl.gov/amg2013.php"
-    git      = "https://github.com/LLNL/AMG"
+    git      = "https://github.com/LLNL/AMG.git"
 
     version('develop', branch='master')
     version('1.0', tag='1.0')
diff --git a/var/spack/repos/builtin/packages/branson/package.py b/var/spack/repos/builtin/packages/branson/package.py
index 999a08d891..a5bf0d4f7f 100644
--- a/var/spack/repos/builtin/packages/branson/package.py
+++ b/var/spack/repos/builtin/packages/branson/package.py
@@ -32,7 +32,7 @@ class Branson(CMakePackage):
 
     homepage = "https://github.com/lanl/branson"
     url      = "https://github.com/lanl/branson/archive/1.01.zip"
-    git      = "https://github.com/lanl/branson"
+    git      = "https://github.com/lanl/branson.git"
 
     tags = ['proxy-app']
 
diff --git a/var/spack/repos/builtin/packages/foam-extend/package.py b/var/spack/repos/builtin/packages/foam-extend/package.py
index 9d103b914b..7de30232a3 100644
--- a/var/spack/repos/builtin/packages/foam-extend/package.py
+++ b/var/spack/repos/builtin/packages/foam-extend/package.py
@@ -76,10 +76,10 @@ class FoamExtend(Package):
 
     homepage = "http://www.extend-project.de/"
 
-    version('4.0', git='http://git.code.sf.net/p/foam-extend/foam-extend-4.0')
-    version('3.2', git='http://git.code.sf.net/p/foam-extend/foam-extend-3.2')
-    version('3.1', git='http://git.code.sf.net/p/foam-extend/foam-extend-3.1')
-    version('3.0', git='http://git.code.sf.net/p/foam-extend/foam-extend-3.0')
+    version('4.0', git='http://git.code.sf.net/p/foam-extend/foam-extend-4.0.git')
+    version('3.2', git='http://git.code.sf.net/p/foam-extend/foam-extend-3.2.git')
+    version('3.1', git='http://git.code.sf.net/p/foam-extend/foam-extend-3.1.git')
+    version('3.0', git='http://git.code.sf.net/p/foam-extend/foam-extend-3.0.git')
 
     # variant('int64', default=False,
     #         description='Compile with 64-bit label')
diff --git a/var/spack/repos/builtin/packages/hoomd-blue/package.py b/var/spack/repos/builtin/packages/hoomd-blue/package.py
index a0093a30cb..c8808549dc 100644
--- a/var/spack/repos/builtin/packages/hoomd-blue/package.py
+++ b/var/spack/repos/builtin/packages/hoomd-blue/package.py
@@ -37,7 +37,7 @@ class HoomdBlue(CMakePackage):
     and perform in situ analysis."""
 
     homepage = "http://glotzerlab.engin.umich.edu/hoomd-blue/"
-    git      = "https://bitbucket.org/glotzer/hoomd-blue"
+    git      = "https://bitbucket.org/glotzer/hoomd-blue.git"
 
     version('develop', submodules=True)
 
diff --git a/var/spack/repos/builtin/packages/hpctoolkit-externals/package.py b/var/spack/repos/builtin/packages/hpctoolkit-externals/package.py
index 78f33e161d..6b836eb838 100644
--- a/var/spack/repos/builtin/packages/hpctoolkit-externals/package.py
+++ b/var/spack/repos/builtin/packages/hpctoolkit-externals/package.py
@@ -30,7 +30,7 @@ class HpctoolkitExternals(Package):
     HpctoolkitExternals package provides all these prerequisites."""
 
     homepage = "http://hpctoolkit.org"
-    git      = "https://github.com/HPCToolkit/hpctoolkit-externals"
+    git      = "https://github.com/HPCToolkit/hpctoolkit-externals.git"
 
     version('master')
     version('2017.06', tag='release-2017.06')
diff --git a/var/spack/repos/builtin/packages/hpctoolkit/package.py b/var/spack/repos/builtin/packages/hpctoolkit/package.py
index 9dfa96d7d8..5943b7f2d2 100644
--- a/var/spack/repos/builtin/packages/hpctoolkit/package.py
+++ b/var/spack/repos/builtin/packages/hpctoolkit/package.py
@@ -34,7 +34,7 @@ class Hpctoolkit(Package):
     and attributes them to the full calling context in which they occur."""
 
     homepage = "http://hpctoolkit.org"
-    git      = "https://github.com/HPCToolkit/hpctoolkit"
+    git      = "https://github.com/HPCToolkit/hpctoolkit.git"
 
     version('master')
     version('2017.06', tag='release-2017.06')
diff --git a/var/spack/repos/builtin/packages/intel-xed/package.py b/var/spack/repos/builtin/packages/intel-xed/package.py
index 5905868ae3..3fe66b9f6f 100644
--- a/var/spack/repos/builtin/packages/intel-xed/package.py
+++ b/var/spack/repos/builtin/packages/intel-xed/package.py
@@ -38,7 +38,7 @@ class IntelXed(Package):
     version('2018.02.14', commit='44d06033b69aef2c20ab01bfb518c52cd71bb537')
 
     resource(name='mbuild',
-             git='https://github.com/intelxed/mbuild',
+             git='https://github.com/intelxed/mbuild.git',
              commit='bb9123152a330c7fa1ff1a502950dc199c83e177',
              destination='')
 
diff --git a/var/spack/repos/builtin/packages/lammps/package.py b/var/spack/repos/builtin/packages/lammps/package.py
index 238e56500a..b05f566cb2 100644
--- a/var/spack/repos/builtin/packages/lammps/package.py
+++ b/var/spack/repos/builtin/packages/lammps/package.py
@@ -35,7 +35,7 @@ class Lammps(CMakePackage):
     """
     homepage = "http://lammps.sandia.gov/"
     url      = "https://github.com/lammps/lammps/archive/patch_1Sep2017.tar.gz"
-    git      = "https://github.com/lammps/lammps"
+    git      = "https://github.com/lammps/lammps.git"
 
     tags = ['ecp', 'ecp-apps']
 
diff --git a/var/spack/repos/builtin/packages/mad-numdiff/package.py b/var/spack/repos/builtin/packages/mad-numdiff/package.py
index b4a0235f55..6003072b2b 100644
--- a/var/spack/repos/builtin/packages/mad-numdiff/package.py
+++ b/var/spack/repos/builtin/packages/mad-numdiff/package.py
@@ -31,7 +31,7 @@ class MadNumdiff(CMakePackage):
 
     homepage = "https://github.com/quinoacomputing/ndiff"
     url      = "https://github.com/quinoacomputing/ndiff/tarball/20150724"
-    git      = "https://github.com/quinoacomputing/ndiff"
+    git      = "https://github.com/quinoacomputing/ndiff.git"
 
     version('develop', branch='master')
     version('20150724', '7723c0f2499aea8fd960377c5bed28d8')
diff --git a/var/spack/repos/builtin/packages/pgmath/package.py b/var/spack/repos/builtin/packages/pgmath/package.py
index 9358d353ce..45a9c77bc3 100644
--- a/var/spack/repos/builtin/packages/pgmath/package.py
+++ b/var/spack/repos/builtin/packages/pgmath/package.py
@@ -30,7 +30,7 @@ class Pgmath(CMakePackage):
     """Flang's math library"""
 
     homepage = "https://github.com/flang-compiler/flang"
-    git      = "https://github.com/flang-compiler/flang"
+    git      = "https://github.com/flang-compiler/flang.git"
 
     version('develop', branch='master')
 
diff --git a/var/spack/repos/builtin/packages/poppler/package.py b/var/spack/repos/builtin/packages/poppler/package.py
index 3d168c1cdc..03ad826327 100644
--- a/var/spack/repos/builtin/packages/poppler/package.py
+++ b/var/spack/repos/builtin/packages/poppler/package.py
@@ -70,7 +70,7 @@ class Poppler(CMakePackage):
     # Only needed to run `make test`
     resource(
         name='test',
-        git='https://anongit.freedesktop.org/git/poppler/test',
+        git='https://anongit.freedesktop.org/git/poppler/test.git',
         placement='testdata'
     )
 
diff --git a/var/spack/repos/builtin/packages/ruby-narray/package.py b/var/spack/repos/builtin/packages/ruby-narray/package.py
index 97d30d96d4..1f9922cf01 100644
--- a/var/spack/repos/builtin/packages/ruby-narray/package.py
+++ b/var/spack/repos/builtin/packages/ruby-narray/package.py
@@ -31,7 +31,7 @@ class RubyNarray(Package):
        similar to numpy.ndaray."""
 
     homepage = "https://rubygems.org/gems/narray"
-    git      = "https://github.com/ruby-numo/narray"
+    git      = "https://github.com/ruby-numo/narray.git"
 
     version('0.9.0.9', commit='9cadbbccf1e01b6d1bc143c19d598cad1c420869')
 
diff --git a/var/spack/repos/builtin/packages/sw4lite/package.py b/var/spack/repos/builtin/packages/sw4lite/package.py
index 75ed9ac76e..d6358f98a9 100644
--- a/var/spack/repos/builtin/packages/sw4lite/package.py
+++ b/var/spack/repos/builtin/packages/sw4lite/package.py
@@ -34,7 +34,7 @@ class Sw4lite(MakefilePackage):
 
     homepage = "https://geodynamics.org/cig/software/sw4"
     url      = "https://github.com/geodynamics/sw4lite/archive/v1.0.zip"
-    git      = "https://github.com/geodynamics/sw4lite"
+    git      = "https://github.com/geodynamics/sw4lite.git"
 
     version('develop', branch='master')
     version('1.0', '3d911165f4f2ff6d5f9c1bd56ab6723f')
diff --git a/var/spack/repos/builtin/packages/swfft/package.py b/var/spack/repos/builtin/packages/swfft/package.py
index 1ffecb82ce..21ccabfb46 100644
--- a/var/spack/repos/builtin/packages/swfft/package.py
+++ b/var/spack/repos/builtin/packages/swfft/package.py
@@ -32,7 +32,7 @@ class Swfft(MakefilePackage):
 
     homepage = "https://xgitlab.cels.anl.gov/hacc/SWFFT"
     url      = "https://xgitlab.cels.anl.gov/api/v4/projects/hacc%2FSWFFT/repository/archive.tar.gz?sha=v1.0"
-    git      = "https://xgitlab.cels.anl.gov/hacc/SWFFT"
+    git      = "https://xgitlab.cels.anl.gov/hacc/SWFFT.git"
 
     version('1.0', '0fbc34544b97ba9c3fb19ef2d7a0f076')
     version('develop', branch='master')
diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py
index b91811e17b..b16d00bb65 100644
--- a/var/spack/repos/builtin/packages/trilinos/package.py
+++ b/var/spack/repos/builtin/packages/trilinos/package.py
@@ -191,12 +191,12 @@ class Trilinos(CMakePackage):
             description='Enable ForTrilinos')
 
     resource(name='dtk',
-             git='https://github.com/ornl-cees/DataTransferKit',
+             git='https://github.com/ornl-cees/DataTransferKit.git',
              tag='master',
              placement='DataTransferKit',
              when='+dtk')
     resource(name='fortrilinos',
-             git='https://github.com/trilinos/ForTrilinos',
+             git='https://github.com/trilinos/ForTrilinos.git',
              tag='develop',
              placement='packages/ForTrilinos',
              when='+fortrilinos')