diff --git a/atomic.spec b/atomic.spec
index de937a6..f82c1ca 100644
--- a/atomic.spec
+++ b/atomic.spec
@@ -82,23 +82,42 @@ make PYTHON=%{__python} docs
 %install
 make PYTHON=%{__python}  install-only DESTDIR=%{buildroot}
 
+# Better support for doing continuous delivery by supporting optional
+# components.  The canonical copy of this is in `rpm-ostree.spec`.
+cat > autofiles.py <<EOF
+#!/usr/bin/python
+import os,sys,glob
+os.chdir(os.environ['RPM_BUILD_ROOT'])
+for line in sys.argv[1:]:
+    if line == '':
+        break
+    assert line[0] == '/'
+    files = glob.glob(line[1:])
+    if len(files) > 0:
+        sys.stderr.write('{0} matched {1} files\n'.format(line, len(files)))
+        sys.stdout.write(line + '\n')
+    else:
+        sys.stderr.write('{0} did not match any files\n'.format(line))
+EOF
+python autofiles.py > files \
+  '%{pysitelib}/Atomic' \
+  '%{pysitelib}/%{name}*.egg-info' \
+  '%{_sysconfdir}/profile.d/%{name}.sh' \
+  '%{_bindir}/%{name}' \
+  '%{_datadir}/%{name}' \
+  '%{_libexecdir}/%{name}/' \
+  '%{_datadir}/bash-completion/completions/%{name}' \
+  '%{_datadir}/dbus-1/system-services/org.%{name}.service' \
+  '%{_datadir}/polkit-1/actions/org.%{name}.policy' \
+  '%{_mandir}/man1/%{name}*'
+
 %check
 [ ! -w /run/docker.sock ] || make PYTHON=%{__python} test
 
-%files
+%files -f files
 %doc COPYING README.md
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.%{name}.conf
-%{pysitelib}/Atomic
-%{pysitelib}/%{name}*.egg-info
-%{_sysconfdir}/profile.d/%{name}.sh
-%{_bindir}/%{name}
-%{_datadir}/%{name}
-%{_datadir}/bash-completion/completions/%{name}
-%{_datadir}/dbus-1/system-services/org.%{name}.service
-%{_datadir}/polkit-1/actions/org.%{name}.policy
-%{_mandir}/man1/%{name}*
-
 
 %changelog
 * Thu Nov 12 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6-6.git09ac479