diff --git a/README.txt b/README.txt
index 7bc04f9e78..944e74ec27 100644
--- a/README.txt
+++ b/README.txt
@@ -22,7 +22,8 @@ our compute api supports: aws-ec2, gogrid, cloudservers-us, stub (in-memory), de
                           elastichosts-sat-p (Peer 1), elastichosts-lon-b (BlueSquare),
                           openhosting-east1, serverlove-z1-man, skalicloud-sdg-my,
                           greenhousedata-element-vcloud, softlayer, cloudsigma (generic),
-                          cloudstack (generic), ninefold-compute, openstack-nova
+                          cloudstack (generic), ninefold-compute, openstack-nov (keystone),
+                          hpcloud-compute
 
   * note * the pom dependency org.jclouds/jclouds-allcompute gives you access to
            to all of these providers
diff --git a/allcompute/pom.xml b/allcompute/pom.xml
index 92a7334192..c4f4cc21c9 100644
--- a/allcompute/pom.xml
+++ b/allcompute/pom.xml
@@ -195,5 +195,10 @@
             <artifactId>ninefold-compute</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.jclouds.provider</groupId>
+            <artifactId>hpcloud-compute</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
 </project>
diff --git a/labs/pom.xml b/labs/pom.xml
index 16aa7ac3ea..fa991fbb3b 100644
--- a/labs/pom.xml
+++ b/labs/pom.xml
@@ -39,7 +39,6 @@
        <module>elb</module>
        <module>aws-elb</module>
        <module>savvis-symphonyvpdc</module>
-       <module>hpcloud-compute</module>
        <module>trystack-nova</module>
     </modules>
 </project>
diff --git a/labs/hpcloud-compute/pom.xml b/providers/hpcloud-compute/pom.xml
similarity index 99%
rename from labs/hpcloud-compute/pom.xml
rename to providers/hpcloud-compute/pom.xml
index 3323424a19..dd4ba59595 100644
--- a/labs/hpcloud-compute/pom.xml
+++ b/providers/hpcloud-compute/pom.xml
@@ -27,7 +27,7 @@
     <version>1.5.0-SNAPSHOT</version>
     <relativePath>../../project/pom.xml</relativePath>
   </parent>
-  <groupId>org.jclouds.labs</groupId>
+  <groupId>org.jclouds.provider</groupId>
   <artifactId>hpcloud-compute</artifactId>
   <name>jclouds HP Cloud Compute provider</name>
   <description>OpenStack Nova implementation targeted to HP Cloud Compute</description>
diff --git a/labs/hpcloud-compute/src/main/java/org/jclouds/hpcloud/compute/HPCloudComputeContextBuilder.java b/providers/hpcloud-compute/src/main/java/org/jclouds/hpcloud/compute/HPCloudComputeContextBuilder.java
similarity index 100%
rename from labs/hpcloud-compute/src/main/java/org/jclouds/hpcloud/compute/HPCloudComputeContextBuilder.java
rename to providers/hpcloud-compute/src/main/java/org/jclouds/hpcloud/compute/HPCloudComputeContextBuilder.java
diff --git a/labs/hpcloud-compute/src/main/java/org/jclouds/hpcloud/compute/HPCloudComputePropertiesBuilder.java b/providers/hpcloud-compute/src/main/java/org/jclouds/hpcloud/compute/HPCloudComputePropertiesBuilder.java
similarity index 100%
rename from labs/hpcloud-compute/src/main/java/org/jclouds/hpcloud/compute/HPCloudComputePropertiesBuilder.java
rename to providers/hpcloud-compute/src/main/java/org/jclouds/hpcloud/compute/HPCloudComputePropertiesBuilder.java
diff --git a/labs/hpcloud-compute/src/main/java/org/jclouds/hpcloud/compute/HPCloudComputeProviderMetadata.java b/providers/hpcloud-compute/src/main/java/org/jclouds/hpcloud/compute/HPCloudComputeProviderMetadata.java
similarity index 100%
rename from labs/hpcloud-compute/src/main/java/org/jclouds/hpcloud/compute/HPCloudComputeProviderMetadata.java
rename to providers/hpcloud-compute/src/main/java/org/jclouds/hpcloud/compute/HPCloudComputeProviderMetadata.java
diff --git a/labs/hpcloud-compute/src/main/java/org/jclouds/hpcloud/compute/HPCloudComputeServiceAdapter.java b/providers/hpcloud-compute/src/main/java/org/jclouds/hpcloud/compute/HPCloudComputeServiceAdapter.java
similarity index 100%
rename from labs/hpcloud-compute/src/main/java/org/jclouds/hpcloud/compute/HPCloudComputeServiceAdapter.java
rename to providers/hpcloud-compute/src/main/java/org/jclouds/hpcloud/compute/HPCloudComputeServiceAdapter.java
diff --git a/labs/hpcloud-compute/src/main/java/org/jclouds/hpcloud/compute/config/HPCloudComputeServiceContextModule.java b/providers/hpcloud-compute/src/main/java/org/jclouds/hpcloud/compute/config/HPCloudComputeServiceContextModule.java
similarity index 100%
rename from labs/hpcloud-compute/src/main/java/org/jclouds/hpcloud/compute/config/HPCloudComputeServiceContextModule.java
rename to providers/hpcloud-compute/src/main/java/org/jclouds/hpcloud/compute/config/HPCloudComputeServiceContextModule.java
diff --git a/labs/hpcloud-compute/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/hpcloud-compute/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
similarity index 100%
rename from labs/hpcloud-compute/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
rename to providers/hpcloud-compute/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
diff --git a/labs/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/HPCloudComputeProviderTest.java b/providers/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/HPCloudComputeProviderTest.java
similarity index 100%
rename from labs/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/HPCloudComputeProviderTest.java
rename to providers/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/HPCloudComputeProviderTest.java
diff --git a/labs/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/compute/HPCloudComputeComputeServiceLiveTest.java b/providers/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/compute/HPCloudComputeComputeServiceLiveTest.java
similarity index 100%
rename from labs/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/compute/HPCloudComputeComputeServiceLiveTest.java
rename to providers/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/compute/HPCloudComputeComputeServiceLiveTest.java
diff --git a/labs/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/compute/HPCloudComputeTemplateBuilderLiveTest.java b/providers/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/compute/HPCloudComputeTemplateBuilderLiveTest.java
similarity index 100%
rename from labs/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/compute/HPCloudComputeTemplateBuilderLiveTest.java
rename to providers/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/compute/HPCloudComputeTemplateBuilderLiveTest.java
diff --git a/labs/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/features/HPCloudComputeFlavorClientLiveTest.java b/providers/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/features/HPCloudComputeFlavorClientLiveTest.java
similarity index 100%
rename from labs/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/features/HPCloudComputeFlavorClientLiveTest.java
rename to providers/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/features/HPCloudComputeFlavorClientLiveTest.java
diff --git a/labs/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/features/HPCloudComputeFloatingIPClientLiveTest.java b/providers/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/features/HPCloudComputeFloatingIPClientLiveTest.java
similarity index 100%
rename from labs/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/features/HPCloudComputeFloatingIPClientLiveTest.java
rename to providers/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/features/HPCloudComputeFloatingIPClientLiveTest.java
diff --git a/labs/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/features/HPCloudComputeImageClientLiveTest.java b/providers/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/features/HPCloudComputeImageClientLiveTest.java
similarity index 100%
rename from labs/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/features/HPCloudComputeImageClientLiveTest.java
rename to providers/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/features/HPCloudComputeImageClientLiveTest.java
diff --git a/labs/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/features/HPCloudComputeKeyPairClientLiveTest.java b/providers/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/features/HPCloudComputeKeyPairClientLiveTest.java
similarity index 100%
rename from labs/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/features/HPCloudComputeKeyPairClientLiveTest.java
rename to providers/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/features/HPCloudComputeKeyPairClientLiveTest.java
diff --git a/labs/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/features/HPCloudComputeSecurityGroupClientLiveTest.java b/providers/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/features/HPCloudComputeSecurityGroupClientLiveTest.java
similarity index 100%
rename from labs/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/features/HPCloudComputeSecurityGroupClientLiveTest.java
rename to providers/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/features/HPCloudComputeSecurityGroupClientLiveTest.java
diff --git a/labs/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/features/HPCloudComputeServerClientLiveTest.java b/providers/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/features/HPCloudComputeServerClientLiveTest.java
similarity index 100%
rename from labs/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/features/HPCloudComputeServerClientLiveTest.java
rename to providers/hpcloud-compute/src/test/java/org/jclouds/hpcloud/compute/features/HPCloudComputeServerClientLiveTest.java
diff --git a/providers/pom.xml b/providers/pom.xml
index 75d1482f13..c0e175d405 100644
--- a/providers/pom.xml
+++ b/providers/pom.xml
@@ -68,6 +68,7 @@
         <module>go2cloud-jhb1</module>
         <module>softlayer</module>
         <module>ninefold-compute</module>
+        <module>hpcloud-compute</module>
         <module>hpcloud-objectstorage</module>
     </modules>
 </project>