diff --git a/share/runtime-cleanup.tmpl b/share/runtime-cleanup.tmpl
index 1f62beed..62583bb4 100644
--- a/share/runtime-cleanup.tmpl
+++ b/share/runtime-cleanup.tmpl
@@ -339,8 +339,7 @@ removefrom python-bugzilla /usr/bin/*
 removefrom python-ethtool /usr/sbin/*
 removefrom python-meh /usr/share/locale/*
 removefrom readline /usr/${libdir}/*
-removefrom report /usr/bin/* /usr/include/* /usr/${libdir}/libstrata_*
-removefrom report /usr/share/locale/*
+removefrom libreport /usr/bin/* /usr/share/locale/*
 removefrom rpm /usr/bin/* /usr/lib/rpm/platform/* /usr/share/locale/*
 removefrom rsync /etc/*
 removefrom sed /usr/share/locale/*
diff --git a/share/runtime-install.tmpl b/share/runtime-install.tmpl
index 3bccd887..ddea3cc2 100644
--- a/share/runtime-install.tmpl
+++ b/share/runtime-install.tmpl
@@ -87,9 +87,10 @@ installpkg fedora-gnome-theme fedora-icon-theme
 installpkg ${product.name}-logos
 installpkg ${product.name}-release
 
-## debugging tools
+## debugging/bug reporting tools
 installpkg gdb-gdbserver
 installpkg python-epdb
+installpkg libreport-plugin-bugzilla libreport-plugin-reportuploader
 
 ## extra tools not required by anaconda
 installpkg vim-minimal strace lsof dump xz less eject