diff --git a/lib/rpc_backend b/lib/rpc_backend
index 7d165a4..1edea15 100644
--- a/lib/rpc_backend
+++ b/lib/rpc_backend
@@ -57,7 +57,11 @@
         fi
     elif is_service_enabled qpid; then
         if is_fedora; then
-            uninstall_package qpid-cpp-server-daemon
+            if [[ $DISTRO =~ (rhel6) ]]; then
+                uninstall_package qpid-cpp-server
+            else
+                uninstall_package qpid-cpp-server-daemon
+            fi
         elif is_ubuntu; then
             uninstall_package qpidd
         else
@@ -87,7 +91,16 @@
         rm -f "$tfile"
     elif is_service_enabled qpid; then
         if is_fedora; then
-            install_package qpid-cpp-server-daemon
+            if [[ $DISTRO =~ (rhel6) ]]; then
+                install_package qpid-cpp-server
+
+               # RHEL6 leaves "auth=yes" in /etc/qpidd.conf, it needs to
+               # be no or you get GSS authentication errors as it
+               # attempts to default to this.
+                sudo sed -i.bak 's/^auth=yes$/auth=no/' /etc/qpidd.conf
+            else
+                install_package qpid-cpp-server-daemon
+            fi
         elif is_ubuntu; then
             install_package qpidd
             sudo sed -i '/PLAIN/!s/mech_list: /mech_list: PLAIN /' /etc/sasl2/qpidd.conf