diff --git a/apis/glacier/pom.xml b/apis/glacier/pom.xml
index d2361567f3..af4cd00f20 100644
--- a/apis/glacier/pom.xml
+++ b/apis/glacier/pom.xml
@@ -121,6 +121,11 @@
       <artifactId>assertj-core</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.google.auto.service</groupId>
+      <artifactId>auto-service</artifactId>
+      <optional>true</optional>
+    </dependency>
   </dependencies>
 
   <profiles>
diff --git a/apis/glacier/src/main/java/org/jclouds/glacier/GlacierApiMetadata.java b/apis/glacier/src/main/java/org/jclouds/glacier/GlacierApiMetadata.java
index e72ee21c7d..ea05a6405f 100644
--- a/apis/glacier/src/main/java/org/jclouds/glacier/GlacierApiMetadata.java
+++ b/apis/glacier/src/main/java/org/jclouds/glacier/GlacierApiMetadata.java
@@ -22,6 +22,7 @@ import static org.jclouds.reflect.Reflection2.typeToken;
 import java.net.URI;
 import java.util.Properties;
 
+import org.jclouds.apis.ApiMetadata;
 import org.jclouds.blobstore.BlobStoreContext;
 import org.jclouds.glacier.blobstore.config.GlacierBlobStoreContextModule;
 import org.jclouds.glacier.config.GlacierHttpApiModule;
@@ -29,12 +30,14 @@ import org.jclouds.glacier.config.GlacierParserModule;
 import org.jclouds.glacier.reference.GlacierHeaders;
 import org.jclouds.rest.internal.BaseHttpApiMetadata;
 
+import com.google.auto.service.AutoService;
 import com.google.common.collect.ImmutableSet;
 import com.google.inject.Module;
 
 /**
  * Implementation of ApiMetadata for Amazon Glacier API
  */
+@AutoService(ApiMetadata.class)
 public class GlacierApiMetadata extends BaseHttpApiMetadata {
 
    private static Builder builder() {
diff --git a/apis/glacier/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/glacier/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
deleted file mode 100644
index ef20fbae11..0000000000
--- a/apis/glacier/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.glacier.GlacierApiMetadata