diff --git a/var/spack/repos/builtin/packages/blitz/package.py b/var/spack/repos/builtin/packages/blitz/package.py
new file mode 100644
index 0000000000..9413b276fe
--- /dev/null
+++ b/var/spack/repos/builtin/packages/blitz/package.py
@@ -0,0 +1,15 @@
+from spack import *
+
+class Blitz(Package):
+    """N-dimensional arrays for C++"""
+    homepage = "http://github.com/blitzpp/blitz"
+    url      = "https://github.com/blitzpp/blitz/tarball/1.0.0"
+
+    version('1.0.0', '9f040b9827fe22228a892603671a77af')
+
+    # No dependencies
+
+    def install(self, spec, prefix):
+        configure('--prefix=%s' % prefix)
+        make()
+        make("install")
diff --git a/var/spack/repos/builtin/packages/netcdf-cxx4/package.py b/var/spack/repos/builtin/packages/netcdf-cxx4/package.py
new file mode 100644
index 0000000000..b83e964b00
--- /dev/null
+++ b/var/spack/repos/builtin/packages/netcdf-cxx4/package.py
@@ -0,0 +1,15 @@
+from spack import *
+
+class NetcdfCxx4(Package):
+    """C++ interface for NetCDF4"""
+    homepage = "http://www.unidata.ucar.edu/software/netcdf"
+    url      = "http://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-cxx4-4.2.tar.gz"
+
+    version('4.2', 'd019853802092cf686254aaba165fc81')
+
+    depends_on('netcdf')
+
+    def install(self, spec, prefix):
+        configure('--prefix=%s' % prefix)
+        make()
+        make("install")
diff --git a/var/spack/repos/builtin/packages/netcdf-fortran/package.py b/var/spack/repos/builtin/packages/netcdf-fortran/package.py
new file mode 100644
index 0000000000..e4e33445e5
--- /dev/null
+++ b/var/spack/repos/builtin/packages/netcdf-fortran/package.py
@@ -0,0 +1,16 @@
+from spack import *
+
+class NetcdfFortran(Package):
+    """Fortran interface for NetCDF4"""
+
+    homepage = "http://www.unidata.ucar.edu/software/netcdf"
+    url      = "http://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-fortran-4.4.3.tar.gz"
+
+    version('4.4.3', 'bfd4ae23a34635b273d3eb0d91cbde9e')
+
+    depends_on('netcdf')
+
+    def install(self, spec, prefix):
+        configure("--prefix=%s" % prefix)
+        make()
+        make("install")
diff --git a/var/spack/repos/builtin/packages/netcdf/package.py b/var/spack/repos/builtin/packages/netcdf/package.py
index 41a0d2b6f9..227362399a 100644
--- a/var/spack/repos/builtin/packages/netcdf/package.py
+++ b/var/spack/repos/builtin/packages/netcdf/package.py
@@ -6,14 +6,13 @@ class Netcdf(Package):
     data formats that support the creation, access, and sharing of array-oriented
     scientific data."""
 
-    homepage = "http://www.unidata.ucar.edu/software/netcdf/"
+    homepage = "http://www.unidata.ucar.edu/software/netcdf"
     url      = "ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-4.3.3.tar.gz"
 
     version('4.4.0', 'cffda0cbd97fdb3a06e9274f7aef438e')
     version('4.3.3', '5fbd0e108a54bd82cb5702a73f56d2ae')
 
     variant('mpi', default=True, description='Enables MPI parallelism')
-    variant('fortran', default=False, description="Download and install NetCDF-Fortran")
     variant('hdf4',    default=False, description="Enable HDF4 support")
 
     # Dependencies:
@@ -66,11 +65,7 @@ def install(self, spec, prefix):
 
         # Fortran support
         # In version 4.2+, NetCDF-C and NetCDF-Fortran have split.
-        # They can be installed separately, but this bootstrap procedure
-        # should be able to install both at the same time.
-        # Note: this is a new experimental feature.
-        if '+fortran' in spec:
-            config_args.append("--enable-remote-fortran-bootstrap")
+        # Use the netcdf-fortran package to install Fortran support.
 
         config_args.append('CPPFLAGS=%s' % ' '.join(CPPFLAGS))
         config_args.append('LDFLAGS=%s'  % ' '.join(LDFLAGS))
@@ -79,8 +74,3 @@ def install(self, spec, prefix):
         configure(*config_args)
         make()
         make("install")
-
-        # After installing NetCDF-C, install NetCDF-Fortran
-        if '+fortran' in spec:
-            make("build-netcdf-fortran")
-            make("install-netcdf-fortran")
diff --git a/var/spack/repos/builtin/packages/proj/package.py b/var/spack/repos/builtin/packages/proj/package.py
new file mode 100644
index 0000000000..797772f4f6
--- /dev/null
+++ b/var/spack/repos/builtin/packages/proj/package.py
@@ -0,0 +1,20 @@
+from spack import *
+
+class Proj(Package):
+    """Cartographic Projections"""
+    homepage = "https://github.com/OSGeo/proj.4/wiki"
+    url      = "http://download.osgeo.org/proj/proj-4.9.2.tar.gz"
+
+    version('4.9.2', '9843131676e31bbd903d60ae7dc76cf9')
+    version('4.9.1', '3cbb2a964fd19a496f5f4265a717d31c')
+    version('4.8.0', 'd815838c92a29179298c126effbb1537')
+    version('4.7.0', '927d34623b52e0209ba2bfcca18fe8cd')
+    version('4.6.1', '7dbaab8431ad50c25669fd3fb28dc493')
+
+    # No dependencies
+
+    def install(self, spec, prefix):
+        configure('--prefix=%s' % prefix)
+
+        make()
+        make("install")
diff --git a/var/spack/repos/builtin/packages/udunits2/package.py b/var/spack/repos/builtin/packages/udunits2/package.py
new file mode 100644
index 0000000000..9954a733bb
--- /dev/null
+++ b/var/spack/repos/builtin/packages/udunits2/package.py
@@ -0,0 +1,16 @@
+from spack import *
+
+class Udunits2(Package):
+    """Automated units conversion"""
+
+    homepage = "http://www.unidata.ucar.edu/software/udunits"
+    url      = "ftp://ftp.unidata.ucar.edu/pub/udunits/udunits-2.2.20.tar.gz"
+
+    version('2.2.20', '1586b70a49dfe05da5fcc29ef239dce0')
+
+    depends_on('expat')
+
+    def install(self, spec, prefix):
+        configure("--prefix=%s" % prefix)
+        make()
+        make("install")