diff --git a/rel-eng/packages/subscription-manager b/rel-eng/packages/subscription-manager

index b7ea50a..3d3b701 100644

--- a/rel-eng/packages/subscription-manager

+++ b/rel-eng/packages/subscription-manager

@@ -1 +1 @@

-1.15.9-4 ./

+1.15.9-5 ./

diff --git a/src/subscription_manager/entcertlib.py b/src/subscription_manager/entcertlib.py

index 48b37fc..6ecf74c 100644

--- a/src/subscription_manager/entcertlib.py

+++ b/src/subscription_manager/entcertlib.py

@@ -273,6 +273,10 @@ class EntCertUpdateAction(object):

                                    rogue_count) % rogue_count

             self.ent_dir.refresh()

+    def delete_by_serial(self, serial):

+        for ent in self.entitlement_dir.list():

+            if str(ent.serial == selection['serial']):

+                ent.delete()

 class EntitlementCertBundlesInstaller(object):

     """Install a list of entitlement cert bundles.

diff --git a/src/subscription_manager/gui/data/ui/allsubs.ui b/src/subscription_manager/gui/data/ui/allsubs.ui

index b2b0a68..f1b60bb 100644

--- a/src/subscription_manager/gui/data/ui/allsubs.ui

+++ b/src/subscription_manager/gui/data/ui/allsubs.ui

@@ -27,9 +27,9 @@

                   <object class="GtkLabel" id="label1">

                     <property name="visible">True</property>

                     <property name="can_focus">False</property>

-                    <property name="xalign">0</property>

                     <property name="label" translatable="yes"><b>Show subscriptions active on:</b></property>

                     <property name="use_markup">True</property>

+                    <property name="xalign">0</property>

                   </object>

                   <packing>

                     <property name="expand">False</property>

@@ -74,8 +74,8 @@

                   <object class="GtkLabel" id="applied_filters_label">

                     <property name="visible">True</property>

                     <property name="can_focus">False</property>

-                    <property name="xalign">1</property>

                     <property name="label" translatable="yes">label</property>

+                    <property name="xalign">1</property>

                   </object>

                   <packing>

                     <property name="expand">True</property>

@@ -120,21 +120,22 @@

                   <object class="GtkLabel" id="edit_quantity_label">

                     <property name="visible">True</property>

                     <property name="can_focus">False</property>

-                    <property name="xalign">0.99000000953674316</property>

-                    <property name="yalign">1</property>

                     <property name="label" translatable="yes">* Click to Adjust Quantity</property>

                     <property name="use_markup">True</property>

+                    <property name="xalign">0.99000000953674316</property>

+                    <property name="yalign">1</property>

                   </object>

                   <packing>

-                    <property name="expand">True</property>

-                    <property name="fill">True</property>

+                    <property name="expand">False</property>

+                    <property name="fill">False</property>

+                    <property name="pack_type">end</property>

                     <property name="position">0</property>

                   </packing>

                 </child>

               </object>

               <packing>

-                <property name="expand">True</property>

-                <property name="fill">True</property>

+                <property name="expand">False</property>

+                <property name="fill">False</property>

                 <property name="position">2</property>

               </packing>

             </child>

@@ -146,9 +147,6 @@

           </packing>

         </child>

         <child>

-          <placeholder/>

-        </child>

-        <child>

           <object class="GtkPaned" id="subs_vpane">

             <property name="visible">True</property>

             <property name="can_focus">True</property>

@@ -186,7 +184,7 @@

           <packing>

             <property name="expand">True</property>

             <property name="fill">True</property>

-            <property name="position">2</property>

+            <property name="position">1</property>

           </packing>

         </child>

         <child>

@@ -230,12 +228,9 @@

           <packing>

             <property name="expand">False</property>

             <property name="fill">False</property>

-            <property name="position">3</property>

+            <property name="position">2</property>

           </packing>

         </child>

-        <child>

-          <placeholder/>

-        </child>

       </object>

     </child>

   </object>

diff --git a/src/subscription_manager/gui/managergui.py b/src/subscription_manager/gui/managergui.py

index 67e9b36..2aae80e 100644

--- a/src/subscription_manager/gui/managergui.py

+++ b/src/subscription_manager/gui/managergui.py

@@ -268,6 +268,7 @@ class MainWindow(widgets.SubmanBaseWidget):

     def _on_cert_check_timer(self):

         self.backend.on_cert_check_timer()

+        return True

     def _on_sla_back_button_press(self):

         self._perform_unregister()

diff --git a/src/subscription_manager/gui/mysubstab.py b/src/subscription_manager/gui/mysubstab.py

index adc471c..bdc2622 100644

--- a/src/subscription_manager/gui/mysubstab.py

+++ b/src/subscription_manager/gui/mysubstab.py

@@ -150,7 +150,7 @@ class MySubscriptionsTab(widgets.SubscriptionManagerTab):

             self.async_bind.unbind(serial, selection, self._unsubscribe_callback, self._handle_unbind_exception)

         else:

             # unregistered, just delete the certs directly

-            self.backend.entcertlib.delete([serial])

+            self.backend.entcertlib.delete_by_serial(serial)

             self.backend.cs.force_cert_check()

     def unsubscribe_button_clicked(self, widget):

diff --git a/src/subscription_manager/managercli.py b/src/subscription_manager/managercli.py

index 706a353..ba1c4d9 100644

--- a/src/subscription_manager/managercli.py

+++ b/src/subscription_manager/managercli.py

@@ -1118,8 +1118,11 @@ class RegisterCommand(UserPassCommand):

             if 'serviceLevel' not in consumer and self.options.service_level:

                 system_exit(os.EX_UNAVAILABLE, _("Error: The --servicelevel option is not supported "

                                  "by the server. Did not complete your request."))

-            autosubscribe(self.cp, consumer['uuid'],

-                    service_level=self.options.service_level)

+            try:

+                autosubscribe(self.cp, consumer['uuid'],

+                        service_level=self.options.service_level)

+            except connection.RestlibException, re:

+                print(re.msg)

         if (self.options.consumerid or self.options.activation_keys or self.autoattach):

             log.info("System registered, updating entitlements if needed")

diff --git a/subscription-manager.spec b/subscription-manager.spec

index c762947..c45672a 100644

--- a/subscription-manager.spec

+++ b/subscription-manager.spec

@@ -49,7 +49,7 @@

 Name: subscription-manager

 Version: 1.15.9

-Release: 4%{?dist}

+Release: 5%{?dist}

 Summary: Tools and libraries for subscription and repository management

 Group:   System Environment/Base

 License: GPLv2

@@ -123,6 +123,8 @@ platform.

 Summary: A plugin for handling OSTree content.

 Group: System Environment/Base

+# ostree package also includes the gobject info for pygobject

+Requires: ostree

 Requires: pygobject3-base

 # plugin needs a slightly newer version of python-iniparse for 'tidy'

 Requires:  python-iniparse >= 0.4

@@ -542,6 +544,15 @@ fi

 %endif

 %changelog

+* Wed Aug 12 2015 Chris Rog <crog@redhat.com> 1.15.9-5

+- 1141128: Imported certificate in detatched scenario not getting deleted

+  (wpoteat@redhat.com)

+- 1221273: Auto-attach failure should not short-circuit other parts of

+  registration (wpoteat@redhat.com)

+- 1185958: Make ostree plugin depend on ostree. (alikins@redhat.com)

+- 1240553: Fix detection of cert dir changes (alikins@redhat.com)

+- Fixing All Subscriptions layout issues (mstead@redhat.com)

+

 * Thu Aug 06 2015 Chris Rog <crog@redhat.com> 1.15.9-4

 - Fix spec file build errors (alikins@redhat.com)

 - Require initial-setup >= 0.3.9.24, no fb on el7 (alikins@redhat.com)