diff --git a/openstack/client.go b/openstack/client.go
index f9c7357..b06a981 100644
--- a/openstack/client.go
+++ b/openstack/client.go
@@ -340,5 +340,7 @@
 	if err != nil {
 		return nil, err
 	}
-	return &gophercloud.ServiceClient{ProviderClient: client, Endpoint: url, ResourceBase: url + "v2.0/"}, nil
+	return &gophercloud.ServiceClient{ProviderClient: client,
+		Endpoint:     url,
+		ResourceBase: url + "v2/"}, nil
 }
diff --git a/openstack/imageservice/v2/images/urls.go b/openstack/imageservice/v2/images/urls.go
index 4c55d34..59b9880 100644
--- a/openstack/imageservice/v2/images/urls.go
+++ b/openstack/imageservice/v2/images/urls.go
@@ -39,6 +39,6 @@
 
 // builds next page full url based on current url
 func nextPageURL(currentURL string, next string) string {
-	base := currentURL[:strings.Index(currentURL, "/images")]
+	base := currentURL[:strings.Index(currentURL, "/v2/images")]
 	return base + next
 }