diff --git a/rel-eng/packages/subscription-manager b/rel-eng/packages/subscription-manager
index 69983e3..00b1473 100644
--- a/rel-eng/packages/subscription-manager
+++ b/rel-eng/packages/subscription-manager
@@ -1 +1 @@
-1.10.14-9 ./
+1.10.14-10 ./
diff --git a/src/subscription_manager/cp_provider.py b/src/subscription_manager/cp_provider.py
index b910359..b54d757 100644
--- a/src/subscription_manager/cp_provider.py
+++ b/src/subscription_manager/cp_provider.py
@@ -80,6 +80,9 @@ class CPProvider(object):
     def get_consumer_auth_cp(self):
         if not self.consumer_auth_cp:
             self.consumer_auth_cp = connection.UEPConnection(
+                    host=self.server_hostname,
+                    ssl_port=self.server_port,
+                    handler=self.server_prefix,
                     proxy_hostname=self.proxy_hostname,
                     proxy_port=self.proxy_port,
                     proxy_user=self.proxy_user,
@@ -90,6 +93,9 @@ class CPProvider(object):
     def get_basic_auth_cp(self):
         if not self.basic_auth_cp:
             self.basic_auth_cp = connection.UEPConnection(
+                    host=self.server_hostname,
+                    ssl_port=self.server_port,
+                    handler=self.server_prefix,
                     proxy_hostname=self.proxy_hostname,
                     proxy_port=self.proxy_port,
                     proxy_user=self.proxy_user,
@@ -101,6 +107,9 @@ class CPProvider(object):
     def get_no_auth_cp(self):
         if not self.no_auth_cp:
             self.no_auth_cp = connection.UEPConnection(
+                    host=self.server_hostname,
+                    ssl_port=self.server_port,
+                    handler=self.server_prefix,
                     proxy_hostname=self.proxy_hostname,
                     proxy_port=self.proxy_port,
                     proxy_user=self.proxy_user,
diff --git a/src/subscription_manager/managercli.py b/src/subscription_manager/managercli.py
index 286c1ec..5220d49 100644
--- a/src/subscription_manager/managercli.py
+++ b/src/subscription_manager/managercli.py
@@ -347,6 +347,8 @@ class CliCommand(AbstractCLICommand):
             cfg.set("server", "port", self.server_port)
             cfg.set("server", "prefix", self.server_prefix)

+            if self.server_port:
+                self.server_port = int(self.server_port)
             config_changed = True

         if hasattr(self.options, "base_url") and self.options.base_url:
diff --git a/subscription-manager.spec b/subscription-manager.spec
index cf294c7..23b0889 100644
--- a/subscription-manager.spec
+++ b/subscription-manager.spec
@@ -14,7 +14,7 @@

 Name: subscription-manager
 Version: 1.10.14
-Release: 9%{?dist}
+Release: 10%{?dist}
 Summary: Tools and libraries for subscription and repository management
 Group:   System Environment/Base
 License: GPLv2
@@ -419,6 +419,10 @@ fi
 %endif

 %changelog
+* Thu Sep 11 2014 Alex Wood <awood@redhat.com> 1.10.14-10
+- 1131213: Do not ignore server info passed in to cp_provider.
+  (awood@redhat.com)
+
 * Wed Jun 04 2014 ckozak <ckozak@redhat.com> 1.10.14-9
 - 1104777: Don't rewrite redhat.repo unless it has changed (ckozak@redhat.com)