diff --git a/var/spack/packages/mesa/package.py b/var/spack/packages/mesa/package.py
index df28d87700..6da13e52b2 100644
--- a/var/spack/packages/mesa/package.py
+++ b/var/spack/packages/mesa/package.py
@@ -5,9 +5,11 @@ class Mesa(Package):
     specification - a system for rendering interactive 3D graphics."""
 
     homepage = "http://www.mesa3d.org"
-    url      = "ftp://ftp.freedesktop.org/pub/mesa/10.4.4/MesaLib-10.4.4.tar.gz"
+    url      = "ftp://ftp.freedesktop.org/pub/mesa/older-versions/7.x/7.11.2/MesaLib-7.11.2.tar.gz"
+    # url      = "ftp://ftp.freedesktop.org/pub/mesa/10.4.4/MesaLib-10.4.4.tar.gz"
 
-    version('10.4.4', '8d863a3c209bf5116b2babfccccc68ce')
+    # version('10.4.4', '8d863a3c209bf5116b2babfccccc68ce')
+    version('7.11.2', 'b9e84efee3931c0acbccd1bb5a860554')
 
     depends_on("py-mako")
     depends_on("flex")
@@ -18,9 +20,7 @@ class Mesa(Package):
     depends_on("libxshmfence")
 
     def install(self, spec, prefix):
-        # FIXME: Modify the configure line to suit your build system here.
         configure("--prefix=%s" % prefix)
 
-        # FIXME: Add logic to build and install here
         make()
         make("install")
diff --git a/var/spack/packages/systemd/package.py b/var/spack/packages/systemd/package.py
deleted file mode 100644
index 647b3bda7b..0000000000
--- a/var/spack/packages/systemd/package.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# FIXME:
-# This is a template package file for Spack.  We've conveniently
-# put "FIXME" labels next to all the things you'll want to change.
-#
-# Once you've edited all the FIXME's, delete this whole message,
-# save this file, and test out your package like this:
-#
-#     spack install systemd
-#
-# You can always get back here to change things with:
-#
-#     spack edit systemd
-#
-# See the spack documentation for more information on building
-# packages.
-#
-from spack import *
-
-class Systemd(Package):
-    """Systemd is a suite of basic building blocks for a Linux system."""
-
-    homepage = "http://www.freedesktop.org/wiki/Software/systemd/"
-    url      = "http://www.freedesktop.org/software/systemd/systemd-218.tar.xz"
-
-    version('218', '4e2c511b0a7932d7fc9d79822273aac6')
-
-    depends_on("gperf")
-    depends_on("coreutils@8.16:") # ln --relative
-    depends_on("util-linux") # libmount
-    depends_on("python@2.7:")
-    depends_on("gcc@4.5:") # pragma gcc diagnostic not allowed inside functions
-
-    def install(self, spec, prefix):
-        configure("--prefix=%s" % prefix, 
-                "CC=%s/gcc -std=gnu99" % spec['gcc'].prefix.bin)
-
-        make()
-        make("install")