diff --git a/cockpit.spec b/cockpit.spec
index 9f98529..f5b1513 100644
--- a/cockpit.spec
+++ b/cockpit.spec
@@ -220,9 +220,9 @@ find %{buildroot}%{_datadir}/%{name}/kubernetes -type f > kubernetes.list
 %endif
 sed -i "s|%{buildroot}||" *.list
 
-# Build the package lists for debug package
-find %{buildroot}/debug%{_datadir}/%{name} -type f > debug.list
-sed -i "s|%{buildroot}/debug||" debug.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
 
 # Move the debug files into place mixed in with the other files
 tar -C %{buildroot}/debug -cf - . | tar -C %{buildroot} -xf -
@@ -248,8 +248,6 @@ rm -rf %{buildroot}/debug
 %{_datadir}/dbus-1/services/com.redhat.Cockpit.service
 %{_libexecdir}/cockpitd
 
-%files debuginfo -f debug.list
-
 %files doc
 %exclude %{_docdir}/%{name}/AUTHORS
 %exclude %{_docdir}/%{name}/COPYING
@@ -388,6 +386,9 @@ fi
 %endif
 
 %changelog
+* Fri Mar 20 2015 Stef Walter <stefw@redhat.com> - 0.44-2
+- Disable separate debuginfo for now: build failure
+
 * Fri Mar 20 2015 Stef Walter <stefw@redhat.com> - 0.44-1
 - Update to 0.44 release