diff --git a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java
index a62c0e7aa5..975b258dc9 100644
--- a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java
+++ b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java
@@ -27,7 +27,7 @@ import org.jclouds.providers.BaseProviderMetadata;
 import org.jclouds.providers.ProviderMetadata;
 
 /**
- * Implementation of @ link org.jclouds.types.ProviderMetadata} for Amazon's Simple Storage Service
+ * Implementation of {@link org.jclouds.types.ProviderMetadata} for Amazon's Simple Storage Service
  * (S3) provider.
  * 
  * @author Adrian Cole
diff --git a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/AWSS3ProviderTest.java b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/AWSS3ProviderTest.java
index 397c4ba7bf..cf959d187c 100644
--- a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/AWSS3ProviderTest.java
+++ b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/AWSS3ProviderTest.java
@@ -23,7 +23,7 @@ import org.jclouds.providers.ProviderMetadata;
 import org.testng.annotations.Test;
 
 /**
- * The AWSS3ProviderTest tests the org.jclouds.providers.AWSS3Provider class.
+ * The AWSS3ProviderTest tests the {@link org.jclouds.aws.s3.AWSS3ProviderMetadata} class.
  * 
  * @author Adrian Cole
  */
@@ -33,4 +33,5 @@ public class AWSS3ProviderTest extends BaseProviderMetadataTest {
    public AWSS3ProviderTest() {
       super(new AWSS3ProviderMetadata(), ProviderMetadata.BLOBSTORE_TYPE);
    }
+
 }
\ No newline at end of file
diff --git a/providers/eucalyptus-partnercloud-ec2/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudEC2ProviderMetadata.java b/providers/eucalyptus-partnercloud-ec2/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudEC2ProviderMetadata.java
index c18ed12397..4158bdbac9 100644
--- a/providers/eucalyptus-partnercloud-ec2/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudEC2ProviderMetadata.java
+++ b/providers/eucalyptus-partnercloud-ec2/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudEC2ProviderMetadata.java
@@ -97,6 +97,14 @@ public class EucalyptusPartnerCloudEC2ProviderMetadata extends BaseProviderMetad
       return URI.create("http://open.eucalyptus.com/wiki/IntroducingEucalyptus_v2.0");
    }
 
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public Set<String> getLinkedServices() {
+      return ImmutableSet.of("eucalyptus-partnercloud-ec2", "eucalyptus-partnercloud-s3");
+   }
+
    /**
     * {@inheritDoc}
     */
diff --git a/providers/eucalyptus-partnercloud-s3/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudS3ProviderMetadata.java b/providers/eucalyptus-partnercloud-s3/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudS3ProviderMetadata.java
index 0c1d6d2d38..38b97d7af1 100644
--- a/providers/eucalyptus-partnercloud-s3/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudS3ProviderMetadata.java
+++ b/providers/eucalyptus-partnercloud-s3/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudS3ProviderMetadata.java
@@ -97,6 +97,14 @@ public class EucalyptusPartnerCloudS3ProviderMetadata extends BaseProviderMetada
       return URI.create("http://open.eucalyptus.com/wiki/IntroducingEucalyptus_v2.0");
    }
 
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public Set<String> getLinkedServices() {
+      return ImmutableSet.of("eucalyptus-partnercloud-ec2", "eucalyptus-partnercloud-s3");
+   }
+
    /**
     * {@inheritDoc}
     */