diff --git a/libvirt.changes b/libvirt.changes
index af6f7f6..86abbbd 100644
--- a/libvirt.changes
+++ b/libvirt.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Oct 14 22:20:41 MDT 2013 - jfehlig@suse.com
+
+- Move virt-login-shell to new subpackage libvirt-login-shell,
+  requiring users to opt-in for this setuid binary.  Note: For now,
+  virt-login-shell will not have setuid permissions, pending
+  resolution of bnc#837609
+
 -------------------------------------------------------------------
 Mon Oct 14 21:25:49 MDT 2013 - jfehlig@suse.com
 
diff --git a/libvirt.spec b/libvirt.spec
index fd0d926..f870a1d 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -892,6 +892,15 @@ Requires:       augeas
 Includes the Sanlock lock manager plugin for the QEMU driver
 %endif
 
+%package login-shell
+Summary:        Login shell for containers
+Group:          Development/Libraries/C and C++
+Requires:       %{name}-client = %{version}-%{release}
+
+%description login-shell
+Povides virt-login-shell, a tool to execute a shell within a container
+matching the users name
+
 %if %{with_python}
 
 %package python
@@ -1597,17 +1606,11 @@ fi
 %doc %{_mandir}/man1/virt-xml-validate.1*
 %doc %{_mandir}/man1/virt-pki-validate.1*
 %doc %{_mandir}/man1/virt-host-validate.1*
-%doc %{_mandir}/man1/virt-login-shell.1*
 %config(noreplace) %{_sysconfdir}/%{name}/libvirt.conf
-%config(noreplace) %{_sysconfdir}/libvirt/virt-login-shell.conf
 %{_bindir}/virsh
 %{_bindir}/virt-xml-validate
 %{_bindir}/virt-pki-validate
 %{_bindir}/virt-host-validate
-# setuid binary that needs security audit - bnc#837609
-# In the meantime, don't install setuid
-#%attr(4755, root, root) %{_bindir}/virt-login-shell
-%{_bindir}/virt-login-shell
 %dir %{_libdir}/%{name}
 %{_libdir}/lib*.so.*
 %attr(0755, root, root) %{_libdir}/%{name}/libvirt-guests.sh
@@ -1687,6 +1690,15 @@ fi
 %attr(0755, root, root) %{_libdir}/%{name}/libvirt_sanlock_helper
 %endif
 
+%files login-shell
+%defattr(-, root, root)
+%config(noreplace) %{_sysconfdir}/libvirt/virt-login-shell.conf
+%doc %{_mandir}/man1/virt-login-shell.1*
+# setuid binary that needs security audit - bnc#837609
+# In the meantime, don't install setuid
+#%attr(4755, root, root) %{_bindir}/virt-login-shell
+%{_bindir}/virt-login-shell
+
 %if %{with_python}
 
 %files python