diff --git a/var/spack/repos/builtin/packages/libsplash/package.py b/var/spack/repos/builtin/packages/libsplash/package.py
index c87dae19be..eb302e596b 100644
--- a/var/spack/repos/builtin/packages/libsplash/package.py
+++ b/var/spack/repos/builtin/packages/libsplash/package.py
@@ -25,7 +25,7 @@
 from spack import *
 
 
-class Libsplash(Package):
+class Libsplash(CMakePackage):
     """libSplash aims at developing a HDF5-based I/O library for HPC
     simulations. It is created as an easy-to-use frontend for the standard HDF5
     library with support for MPI processes in a cluster environment. While the
@@ -54,11 +54,3 @@ class Libsplash(Package):
     depends_on('hdf5@1.8.6:')
     depends_on('hdf5+mpi', when='+mpi')
     depends_on('mpi', when='+mpi')
-
-    def install(self, spec, prefix):
-        with working_dir('spack-build', create=True):
-            cmake('-DCMAKE_INSTALL_PREFIX=%s' % prefix,
-                  '..', *std_cmake_args)
-
-            make()
-            make('install')
diff --git a/var/spack/repos/builtin/packages/pngwriter/package.py b/var/spack/repos/builtin/packages/pngwriter/package.py
index 6a34ab5abf..2950129765 100644
--- a/var/spack/repos/builtin/packages/pngwriter/package.py
+++ b/var/spack/repos/builtin/packages/pngwriter/package.py
@@ -25,7 +25,7 @@
 from spack import *
 
 
-class Pngwriter(Package):
+class Pngwriter(CMakePackage):
     """PNGwriter is a very easy to use open source graphics library that uses
     PNG as its output format. The interface has been designed to be as simple
     and intuitive as possible. It supports plotting and reading pixels in the
@@ -49,11 +49,3 @@ class Pngwriter(Package):
     depends_on('libpng')
     depends_on('zlib')
     depends_on('freetype')
-
-    def install(self, spec, prefix):
-        with working_dir('spack-build', create=True):
-            cmake('-DCMAKE_INSTALL_PREFIX=%s' % prefix,
-                  '..', *std_cmake_args)
-
-            make()
-            make('install')