diff --git a/openstack/networking/v2/apiversions/requests.go b/openstack/networking/v2/apiversions/requests.go
index 8e3ff32..31e07fd 100644
--- a/openstack/networking/v2/apiversions/requests.go
+++ b/openstack/networking/v2/apiversions/requests.go
@@ -1,11 +1,18 @@
 package apiversions
 
-import "github.com/rackspace/gophercloud"
+import (
+	"github.com/rackspace/gophercloud"
+	"github.com/rackspace/gophercloud/pagination"
+)
 
-func ListVersions(c *gophercloud.ServiceClient) gophercloud.Pager {
-	return gophercloud.NewLinkedPager(c, APIVersionsURL(c))
+func ListVersions(c *gophercloud.ServiceClient) pagination.Pager {
+	return pagination.NewPager(c, APIVersionsURL(c), func(r pagination.LastHTTPResponse) pagination.Page {
+		return APIVersionPage{pagination.SinglePageBase(r)}
+	})
 }
 
-func ListVersionResources(c *gophercloud.ServiceClient, v string) gophercloud.Pager {
-	return gophercloud.NewLinkedPager(c, APIInfoURL(c, v))
+func ListVersionResources(c *gophercloud.ServiceClient, v string) pagination.Pager {
+	return pagination.NewPager(c, APIInfoURL(c, v), func(r pagination.LastHTTPResponse) pagination.Page {
+		return APIVersionResourcePage{pagination.SinglePageBase(r)}
+	})
 }
diff --git a/openstack/networking/v2/apiversions/requests_test.go b/openstack/networking/v2/apiversions/requests_test.go
index 0922318..7c713e1 100644
--- a/openstack/networking/v2/apiversions/requests_test.go
+++ b/openstack/networking/v2/apiversions/requests_test.go
@@ -6,6 +6,7 @@
 	"testing"
 
 	"github.com/rackspace/gophercloud"
+	"github.com/rackspace/gophercloud/pagination"
 	th "github.com/rackspace/gophercloud/testhelper"
 )
 
@@ -50,7 +51,7 @@
 
 	count := 0
 
-	ListVersions(ServiceClient()).EachPage(func(page gophercloud.Page) (bool, error) {
+	ListVersions(ServiceClient()).EachPage(func(page pagination.Page) (bool, error) {
 		count++
 		actual, err := ExtractAPIVersions(page)
 		if err != nil {
@@ -126,7 +127,7 @@
 
 	count := 0
 
-	ListVersionResources(ServiceClient(), "v2.0").EachPage(func(page gophercloud.Page) (bool, error) {
+	ListVersionResources(ServiceClient(), "v2.0").EachPage(func(page pagination.Page) (bool, error) {
 		count++
 		actual, err := ExtractVersionResources(page)
 		if err != nil {
diff --git a/openstack/networking/v2/apiversions/results.go b/openstack/networking/v2/apiversions/results.go
index dbf40eb..9181e7e 100644
--- a/openstack/networking/v2/apiversions/results.go
+++ b/openstack/networking/v2/apiversions/results.go
@@ -2,7 +2,7 @@
 
 import (
 	"github.com/mitchellh/mapstructure"
-	"github.com/rackspace/gophercloud"
+	"github.com/rackspace/gophercloud/pagination"
 )
 
 type APIVersion struct {
@@ -10,12 +10,24 @@
 	ID     string `mapstructure:"id" json:"id"`
 }
 
-func ExtractAPIVersions(page gophercloud.Page) ([]APIVersion, error) {
+type APIVersionPage struct {
+	pagination.SinglePageBase
+}
+
+func (r APIVersionPage) IsEmpty() (bool, error) {
+	is, err := ExtractAPIVersions(r)
+	if err != nil {
+		return true, err
+	}
+	return len(is) == 0, nil
+}
+
+func ExtractAPIVersions(page pagination.Page) ([]APIVersion, error) {
 	var resp struct {
 		Versions []APIVersion `mapstructure:"versions"`
 	}
 
-	err := mapstructure.Decode(page.(gophercloud.LinkedPage).Body, &resp)
+	err := mapstructure.Decode(page.(APIVersionPage).Body, &resp)
 	if err != nil {
 		return nil, err
 	}
@@ -28,12 +40,24 @@
 	Collection string `mapstructure:"collection" json:"collection"`
 }
 
-func ExtractVersionResources(page gophercloud.Page) ([]APIVersionResource, error) {
+type APIVersionResourcePage struct {
+	pagination.SinglePageBase
+}
+
+func (r APIVersionResourcePage) IsEmpty() (bool, error) {
+	is, err := ExtractVersionResources(r)
+	if err != nil {
+		return true, err
+	}
+	return len(is) == 0, nil
+}
+
+func ExtractVersionResources(page pagination.Page) ([]APIVersionResource, error) {
 	var resp struct {
 		APIVersionResources []APIVersionResource `mapstructure:"resources"`
 	}
 
-	err := mapstructure.Decode(page.(gophercloud.LinkedPage).Body, &resp)
+	err := mapstructure.Decode(page.(APIVersionResourcePage).Body, &resp)
 	if err != nil {
 		return nil, err
 	}