diff --git a/var/spack/repos/builtin/packages/libpipeline/package.py b/var/spack/repos/builtin/packages/libpipeline/package.py
index 726252e1cb..8ee4d93dc6 100644
--- a/var/spack/repos/builtin/packages/libpipeline/package.py
+++ b/var/spack/repos/builtin/packages/libpipeline/package.py
@@ -11,9 +11,11 @@ class Libpipeline(AutotoolsPackage):
     in a flexible and convenient way."""
 
     homepage = "http://libpipeline.nongnu.org/"
-    url      = "https://git.savannah.nongnu.org/cgit/libpipeline.git/snapshot/libpipeline-1.4.2.tar.gz"
+    git = "https://gitlab.com/cjwatson/libpipeline"
+    url = "https://download.savannah.nongnu.org/releases/libpipeline/libpipeline-1.5.5.tar.gz"
 
-    version('1.4.2', sha256='ac8b103b281ff63129c4fa6a8cc40bb5863e3a4266343d6e3bb5788de1ede488')
+    version('1.5.5', sha256='0c8367f8b82bb721b50647a647115b6e62a37e3b2e954a9685e4d933f30c00cc')
+    version('1.4.2', sha256='fef1fc9aa40ce8796f18cd1aecd888a9484a9556c8b0f8d07c863578277679be')
 
     depends_on('pkgconfig', type='build')
     depends_on('check', type='test')
diff --git a/var/spack/repos/builtin/packages/man-db/package.py b/var/spack/repos/builtin/packages/man-db/package.py
index 1e2696cf96..c91f494fac 100644
--- a/var/spack/repos/builtin/packages/man-db/package.py
+++ b/var/spack/repos/builtin/packages/man-db/package.py
@@ -13,14 +13,18 @@ class ManDb(AutotoolsPackage):
     flat-text whatis databases."""
 
     homepage = "https://www.nongnu.org/man-db/"
-    url      = "https://git.savannah.nongnu.org/cgit/man-db.git/snapshot/man-db-2.7.6.1.tar.gz"
+    git      = "https://gitlab.com/cjwatson/man-db"
+    url      = "https://download.savannah.nongnu.org/releases/man-db/man-db-2.10.1.tar.xz"
 
-    version('2.7.6.1', sha256='dd913662e341fc01e6721878b6cbe1001886cc3bfa6632b095937bba3238c779')
+    version('2.10.1', sha256='2ffd8f2e80122fe72e60c740c851e6a3e15c9a7921185eb4752c1c672824bed6')
+    version('2.7.6.1', sha256='08edbc52f24aca3eebac429b5444efd48b9b90b9b84ca0ed5507e5c13ed10f3f')
 
-    depends_on('autoconf')
-    depends_on('automake')
+    depends_on('pkgconf', type='build')
     depends_on('gettext')
-    depends_on('libpipeline')
+    depends_on('libpipeline@1.5.0:', when='@2.8.0:')
+    depends_on('libpipeline@1.4.0:', when='@2.7.1:')
+    depends_on('libpipeline@1.3.0:', when='@2.6.7:')
+    depends_on('libpipeline@1.1.0:', when='@2.6.0:')
     depends_on('flex')
     depends_on('gdbm')
     depends_on('groff', type=('build', 'link', 'run'))
@@ -38,3 +42,6 @@ def configure_args(self):
             '--with-systemdtmpfilesdir={0}/tmp'.format(self.prefix)
         ]
         return args
+
+    def install(self, spec, prefix):
+        make('install', 'DESTDIR=%s' % prefix)