diff --git a/var/spack/packages/py-basemap/package.py b/var/spack/packages/py-basemap/package.py
index 45f1085ba1a..8dfc99b28d6 100644
--- a/var/spack/packages/py-basemap/package.py
+++ b/var/spack/packages/py-basemap/package.py
@@ -11,8 +11,8 @@ class PyBasemap(Package):
     extends('python')
     depends_on('py-setuptools')
     depends_on('py-numpy')
-    depends_on('py-matplotlib')
-    depends_on('py-pil')
+    depends_on('py-matplotlib+gui')
+    depends_on('py-pillow')
     depends_on("geos")
 
     def install(self, spec, prefix):
diff --git a/var/spack/packages/py-pillow/package.py b/var/spack/packages/py-pillow/package.py
new file mode 100644
index 00000000000..adc8507bd57
--- /dev/null
+++ b/var/spack/packages/py-pillow/package.py
@@ -0,0 +1,14 @@
+from spack import *
+
+class PyPillow(Package):
+    """Pillow is the friendly PIL fork by Alex Clark and Contributors. PIL is the Python Imaging Library by Fredrik Lundh and Contributors. The Python Imaging Library (PIL) adds image processing capabilities to your Python interpreter. This library supports many file formats, and provides powerful image processing and graphics capabilities."""
+
+    homepage = "https://python-pillow.github.io/"
+    url      = "https://pypi.python.org/packages/source/P/Pillow/Pillow-3.0.0.tar.gz"
+
+    version('3.0.0', 'fc8ac44e93da09678eac7e30c9b7377d')
+    extends('python')
+    depends_on('py-setuptools')
+
+    def install(self, spec, prefix):
+        python('setup.py', 'install', '--prefix=%s' % prefix)