diff --git a/drivers/staging/greybus/connection.c b/drivers/staging/greybus/connection.c
index b32da8af68f4..1a657f706b93 100644
--- a/drivers/staging/greybus/connection.c
+++ b/drivers/staging/greybus/connection.c
@@ -251,7 +251,12 @@ gb_connection_create_range(struct greybus_host_device *hd,
 
 	spin_unlock_irq(&gb_connections_lock);
 
-	/* XXX Will have to establish connections to get version */
+	if (hd_cport_id != GB_SVC_CPORT_ID) {
+		gb_svc_connection_create(hd->svc,
+					 hd->endo->ap_intf_id, hd_cport_id,
+					 bundle->intf->interface_id, cport_id);
+	}
+
 	gb_connection_bind_protocol(connection);
 	if (!connection->protocol)
 		dev_warn(&connection->dev,
diff --git a/drivers/staging/greybus/greybus.h b/drivers/staging/greybus/greybus.h
index 90f996276ca4..ef11b960d1b7 100644
--- a/drivers/staging/greybus/greybus.h
+++ b/drivers/staging/greybus/greybus.h
@@ -103,6 +103,7 @@ struct greybus_host_device {
 
 	struct gb_endo *endo;
 	struct gb_connection *initial_svc_connection;
+	struct gb_svc *svc;
 
 	/* Private data for the host driver */
 	unsigned long hd_priv[0] __aligned(sizeof(s64));
diff --git a/drivers/staging/greybus/svc.c b/drivers/staging/greybus/svc.c
index 3d1808712598..b718a881a7e3 100644
--- a/drivers/staging/greybus/svc.c
+++ b/drivers/staging/greybus/svc.c
@@ -430,6 +430,7 @@ static int gb_svc_connection_init(struct gb_connection *connection)
 	if (!svc)
 		return -ENOMEM;
 
+	connection->hd->svc = svc;
 	svc->connection = connection;
 	connection->private = svc;
 
@@ -445,6 +446,7 @@ static void gb_svc_connection_exit(struct gb_connection *connection)
 {
 	struct gb_svc *svc = connection->private;
 
+	connection->hd->svc = NULL;
 	connection->private = NULL;
 	kfree(svc);
 }