diff --git a/cockpit.spec b/cockpit.spec
index f5b1513..e2af175 100644
--- a/cockpit.spec
+++ b/cockpit.spec
@@ -25,7 +25,7 @@ Version:        %{gitcommit}
 %else
 Version:        0.44
 %endif
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A user interface for Linux servers
 
 License:        LGPLv2+
@@ -220,14 +220,20 @@ find %{buildroot}%{_datadir}/%{name}/kubernetes -type f > kubernetes.list
 %endif
 sed -i "s|%{buildroot}||" *.list
 
-# XXX for now put all debug info in the shell package
-find %{buildroot}/debug%{_datadir}/%{name} -type f >> shell.list
-sed -i "s|%{buildroot}/debug||" shell.list
+# Build the package lists for debug package
+find %{buildroot}/debug%{_datadir}/%{name} -type f > debug.list
+sed -i "s|%{buildroot}/debug||" debug.list
 
 # Move the debug files into place mixed in with the other files
 tar -C %{buildroot}/debug -cf - . | tar -C %{buildroot} -xf -
 rm -rf %{buildroot}/debug
 
+# Redefine how debug info is built to slip in our extra debug files
+%define __debug_install_post   \
+   %{_rpmconfigdir}/find-debuginfo.sh %{?_missing_build_ids_terminate_build:--strict-build-id} %{?_include_minidebuginfo:-m} %{?_find_debuginfo_dwz_opts} %{?_find_debuginfo_opts} "%{_builddir}/%{?buildsubdir}" \
+   cat debug.list >> %{_builddir}/%{?buildsubdir}/debugfiles.list \
+%{nil}
+
 %files
 %{_docdir}/%{name}/AUTHORS
 %{_docdir}/%{name}/COPYING
@@ -386,6 +392,9 @@ fi
 %endif
 
 %changelog
+* Sat Mar 21 2015 Stef Walter <stefw@redhat.com> - 0.44-3
+- Add back debuginfo files to the right place
+
 * Fri Mar 20 2015 Stef Walter <stefw@redhat.com> - 0.44-2
 - Disable separate debuginfo for now: build failure