diff --git a/openmc/data/photon.py b/openmc/data/photon.py
index c42defb9e..d2750d934 100644
--- a/openmc/data/photon.py
+++ b/openmc/data/photon.py
@@ -441,10 +441,7 @@ class IncidentPhoton(EqualityMixin):
         # Add stopping power data
         if Z < 99:
             data.stopping_powers['energy'] = _STOPPING_POWERS['energy']
-            S = _STOPPING_POWERS[Z]
-            keys = ['density', 'I', 's_collision', 's_radiative', 'density_effect']
-            for k in keys:
-                data.stopping_powers[k] = S[k]
+            data.stopping_powers.update(_STOPPING_POWERS[Z])
 
         # Load bremsstrahlung data if it has not yet been loaded
         if not _BREMSSTRAHLUNG:
@@ -459,17 +456,17 @@ class IncidentPhoton(EqualityMixin):
             j = 39
 
             # Get incident electron kinetic energy values
-            _BREMSSTRAHLUNG['electron_energy'] = [float(x) for x in brem[j:j+n]]
+            _BREMSSTRAHLUNG['electron_energy'] = np.fromiter(brem[j:j+n], float, n)
             j += n
 
             # Get reduced photon energy values
-            _BREMSSTRAHLUNG['photon_energy'] = [float(x) for x in brem[j:j+k]]
+            _BREMSSTRAHLUNG['photon_energy'] = np.fromiter(brem[j:j+k], float, k)
             j += k
 
             for i in range(1, 101):
                 # Get the scaled cross section values for each electron energy and
                 # reduced photon energy for this Z
-                dcs = np.reshape([float(x) for x in brem[j:j+k*n]], (n, k))
+                dcs = np.reshape(np.fromiter(brem[j:j+n*k], float, n*k), (n, k))
                 j += k*n
 
                 _BREMSSTRAHLUNG[i] = {'dcs': dcs}
@@ -602,13 +599,11 @@ class IncidentPhoton(EqualityMixin):
         if self.stopping_powers:
             s_group = group.create_group('stopping_powers')
 
-            S = self.stopping_powers
-            s_group.attrs['density'] = S['density']
-            s_group.attrs['I'] = S['I']
-
-            keys = ['energy', 's_collision', 's_radiative', 'density_effect']
-            for k in keys:
-                s_group.create_dataset(k, data=S[k])
+            for key, value in self.stopping_powers.items():
+                if key in ('density', 'I'):
+                    s_group.attrs[key] = value
+                else:
+                    s_group.create_dataset(key, data=value)
 
         # Write bremsstrahlung
         if self.bremsstrahlung:
diff --git a/openmc/data/stopping_powers.h5 b/openmc/data/stopping_powers.h5
new file mode 100644
index 000000000..7730925cf
Binary files /dev/null and b/openmc/data/stopping_powers.h5 differ
diff --git a/setup.py b/setup.py
index d0c6bd5b2..ab93748b0 100755
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,7 @@ kwargs = {'name': 'openmc',
           # Data files and librarries
           'package_data': {
               'openmc': ['_libopenmc.{}'.format(suffix)],
-              'openmc.data': ['mass.mas12', 'fission_Q_data_endfb71.h5']
+              'openmc.data': ['mass.mas12', '*.h5']
           },
 
           # Metadata
@@ -67,15 +67,6 @@ if have_setuptools:
             'vtk': ['vtk', 'silomesh'],
             'validate': ['lxml']
         },
-
-        # Data files
-        'package_data': {
-            'openmc.data': [
-                'mass.mas12',
-                'fission_Q_data_endfb71.h5',
-                'compton_profiles.h5'
-            ]
-        },
     })
 
 # If Cython is present, add resonance reconstruction capability