diff --git a/var/spack/repos/builtin/packages/libgit2/package.py b/var/spack/repos/builtin/packages/libgit2/package.py
index 1bc18d3c80..257bd01de5 100644
--- a/var/spack/repos/builtin/packages/libgit2/package.py
+++ b/var/spack/repos/builtin/packages/libgit2/package.py
@@ -18,6 +18,7 @@ class Libgit2(CMakePackage):
 
     maintainers = ["AndrewGaspar"]
 
+    version('1.1.0',   sha256='41a6d5d740fd608674c7db8685685f45535323e73e784062cf000a633d420d1e')
     version('1.0.1',   sha256='1775427a6098f441ddbaa5bd4e9b8a043c7401e450ed761e69a415530fea81d2')
     version('1.0.0',   sha256='6a1fa16a7f6335ce8b2630fbdbb5e57c4027929ebc56fcd1ac55edb141b409b4')
     version('0.99.0',  sha256='174024310c1563097a6613a0d3f7539d11a9a86517cd67ce533849065de08a11')
diff --git a/var/spack/repos/builtin/packages/py-pygit2/package.py b/var/spack/repos/builtin/packages/py-pygit2/package.py
index a723fb6198..8240819fef 100644
--- a/var/spack/repos/builtin/packages/py-pygit2/package.py
+++ b/var/spack/repos/builtin/packages/py-pygit2/package.py
@@ -14,15 +14,26 @@ class PyPygit2(PythonPackage):
     homepage = "http://www.pygit2.org/"
     pypi = "pygit2/pygit2-0.24.1.tar.gz"
 
+    version('1.4.0', sha256='cbeb38ab1df9b5d8896548a11e63aae8a064763ab5f1eabe4475e6b8a78ee1c8')
+    version('1.3.0', sha256='0be93f6a8d7cbf0cc79ae2f0afb1993fc055fc0018c27e2bd01ba143e51d4452')
+    version('0.28.2', sha256='4d8c3fbbf2e5793a9984681a94e6ac2f1bc91a92cbac762dbdfbea296b917f86')
     version('0.24.1', sha256='4d1d0196b38d6012faf0a7c45e235c208315672b6035da504566c605ba494064')
 
-    extends('python')
     depends_on('py-setuptools', type='build')
     # Version must match with libgit2
     # See: http://www.pygit2.org/install.html
-    depends_on('libgit2@0.24:', when='@0.24:')
+    depends_on('libgit2@1.1:1.1.99', when='@1.4:')
+    depends_on('libgit2@1.0:1.0.99', when='@1.2:1.3.99')
+    depends_on('libgit2@0.99:1.0.99', when='@1.1:1.1.99')
+    depends_on('libgit2@0.28:0.28.99', when='@0.28:1.0.99')
+    depends_on('libgit2@0.24:0.27.99', when='@0.24:0.27.99')
+    depends_on('python@3.6:', when='@1.4.0:')
+    depends_on('python@3.6:3.8.99', when='@1.2:1.3.99')
+    depends_on('python@3.5:3.8.99', when='@1.0:1.1.99')
+    depends_on('python@2.7:3.7.99', when='@0.28:0.99.99')
     depends_on('py-six', type=('build', 'run'))
-    depends_on('py-cffi', type=('build', 'run'))
+    depends_on('py-cffi@1.4.0:', type=('build', 'run'))
+    depends_on('py-cached-property', when='@1.1.0:', type=('build', 'run'))
 
     def setup_build_environment(self, env):
         spec = self.spec