diff --git a/scalasca.spec b/scalasca.spec
index 9ef7f5d..8149682 100644
--- a/scalasca.spec
+++ b/scalasca.spec
@@ -4,7 +4,7 @@
 # NB many rpm warnings, mostly undefined-non-weak-symbol, which I
 # think are ignorable.
 
-# fixme: Make common package for whatever can be shared between MPI versions.
+# fixme: Make common package for .spec data files and anything else common
 #	 Check on ignored omp pragmas -- from newer openmp?
 
 # In case we can support el6
@@ -23,7 +23,7 @@
 
 Name:		scalasca
 Version:	%ver
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Toolset for performance analysis of large-scale parallel applications
 
 # ScoutPatternParser and SilasConfigParser are GPL
@@ -88,7 +88,7 @@ Documentation for %name
 %prep
 %setup -q
 %patch0 -p1 -b .pearl
-mkdir openmpi mpich
+mkdir openmpi mpich simple
 rm -r vendor/cube vendor/otf2	# bundled libraries
 
 
@@ -98,7 +98,7 @@ export MPI_CXXFLAGS=-std=gnu++98 CXXFLAGS=-std=gnu++98
 %global _configure ../configure
 %global do_build \
 %configure --with-otf2 --with-cube --enable-shared --libdir=$MPI_LIB \\\
-	   --bindir=$MPI_BIN LDFLAGS=-Wl,--as-needed \\\
+	   --bindir=$MPI_BIN --datadir=$MPI_HOME/share LDFLAGS=-Wl,--as-needed \\\
 	   --enable-backend-test-runs --disable-silent-rules \
 	   make %{?_smp_mflags}
 pushd openmpi
@@ -113,6 +113,11 @@ pushd mpich
 %_mpich_unload
 popd
 %endif
+pushd simple
+%configure --with-otf2 --with-cube --enable-shared LDFLAGS=-Wl,--as-needed \
+	   --enable-backend-test-runs --disable-silent-rules --without-mpi
+make %{?_smp_mflags}
+popd
 
 
 %install
@@ -121,8 +126,9 @@ make install -C openmpi DESTDIR=$RPM_BUILD_ROOT
 %if %{with mpich}
 make install -C mpich DESTDIR=$RPM_BUILD_ROOT
 %endif
+make install -C simple DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%_libdir/*/lib/*.{a,la}
+find $RPM_BUILD_ROOT%_libdir \( -name \*.la -o -name \*.a \) -exec rm -f {} \;
 
 
 %check
@@ -132,10 +138,18 @@ OMPI_MCA_orte_allocation_required=0 OMPI_MCA_btl=sm,self \
 make check VERBOSE=1
 
 %{!?_licensedir:%global license %%doc}
-%files openmpi
+%files
 %doc README
 %license COPYING
 %_datadir/%name
+%exclude %_libdir/*.so
+%_libdir/*.so.*
+%_bindir/*
+
+%files openmpi
+%doc README
+%license COPYING
+%_libdir/openmpi/share/%name
 %exclude %_libdir/openmpi/lib/*.so
 %_libdir/openmpi/lib/*.so.*
 %_libdir/openmpi/bin/*
@@ -144,7 +158,7 @@ make check VERBOSE=1
 %files mpich
 %doc README
 %license COPYING
-%_datadir/%name
+%_libdir/mpich/share/%name
 %exclude %_libdir/mpich/lib/*.so
 %_libdir/mpich/lib/*.so.*
 %_libdir/mpich/bin/*
@@ -155,6 +169,11 @@ make check VERBOSE=1
 
 
 %changelog
+* Wed May 11 2016 Dave Love <loveshack@fedoraproject.org> - 2.3-3
+- Build non-MPI version
+  Resolves: rhbz#1334560
+- Use separate datadirs; at least summary file is build-dependent
+
 * Sat Apr 16 2016 Orion Poplawski <orion@cora.nwra.com> - 2.3-2
 - Just fix test program linkage