diff --git a/share/spack/setup-env.sh b/share/spack/setup-env.sh
index 91b1dc46302abb503afeac5e1bc796697bd1d7bf..b2bcbaf6c7cfda834973803f6878232215c66226 100755
--- a/share/spack/setup-env.sh
+++ b/share/spack/setup-env.sh
@@ -165,8 +165,8 @@ fi
 #
 # Set up modules and dotkit search paths in the user environment
 #
-_sp_share_dir="$(dirname $_sp_source_file)"
-_sp_prefix="$(dirname $(dirname $_sp_share_dir))"
+_sp_share_dir=$(cd "$(dirname $_sp_source_file)" && pwd)
+_sp_prefix=$(cd "$(dirname $(dirname $_sp_share_dir))" && pwd)
 
 # TODO: fix SYS_TYPE to something non-LLNL-specific
 _spack_pathadd DK_NODE    "$_sp_share_dir/dotkit/$SYS_TYPE"
diff --git a/var/spack/packages/py-mako/package.py b/var/spack/packages/py-mako/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..3e91ffd8e57f678458caaee831da72c2208e4231
--- /dev/null
+++ b/var/spack/packages/py-mako/package.py
@@ -0,0 +1,16 @@
+from spack import *
+
+class PyMako(Package):
+    """A super-fast templating language that borrows the best 
+    ideas from the existing templating languages."""
+
+    homepage = "https://pypi.python.org/pypi/mako"
+    url      = "https://pypi.python.org/packages/source/M/Mako/Mako-1.0.1.tar.gz"
+
+    version('1.0.1', '9f0aafd177b039ef67b90ea350497a54')
+
+    depends_on('py-setuptools')
+    extends('python')
+
+    def install(self, spec, prefix):
+        python('setup.py', 'install', '--prefix=%s' % prefix)