diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/BundleTask.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/BundleTask.java
index 2a13241212..37a5c55698 100644
--- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/BundleTask.java
+++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/BundleTask.java
@@ -31,6 +31,7 @@ public class BundleTask implements Comparable<BundleTask> {
    /**
     * {@inheritDoc}
     */
+   @Override
    public int compareTo(BundleTask o) {
       return (this == o) ? 0 : getBundleId().compareTo(o.getBundleId());
    }
diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/Image.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/Image.java
index 42136cd31c..6a037ad086 100644
--- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/Image.java
+++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/Image.java
@@ -353,6 +353,7 @@ public class Image implements Comparable<Image> {
    /**
     * {@inheritDoc}
     */
+   @Override
    public int compareTo(Image o) {
       return (this == o) ? 0 : getId().compareTo(o.getId());
    }
diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/KeyPair.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/KeyPair.java
index 22b15be6fc..69231aad50 100644
--- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/KeyPair.java
+++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/KeyPair.java
@@ -113,6 +113,7 @@ public class KeyPair implements Comparable<KeyPair> {
    /**
     * {@inheritDoc}
     */
+   @Override
    public int compareTo(KeyPair o) {
       return (this == o) ? 0 : getKeyName().compareTo(o.getKeyName());
    }
diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/PublicIpInstanceIdPair.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/PublicIpInstanceIdPair.java
index b0d24bff28..a44276cc16 100644
--- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/PublicIpInstanceIdPair.java
+++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/PublicIpInstanceIdPair.java
@@ -52,6 +52,7 @@ public class PublicIpInstanceIdPair implements Comparable<PublicIpInstanceIdPair
    /**
     * {@inheritDoc}
     */
+   @Override
    public int compareTo(PublicIpInstanceIdPair o) {
       return (this == o) ? 0 : getPublicIp().compareTo(o.getPublicIp());
    }
diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/UserIdGroupPair.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/UserIdGroupPair.java
index 5177cb02e6..a285cc6d2f 100644
--- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/UserIdGroupPair.java
+++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/UserIdGroupPair.java
@@ -43,6 +43,7 @@ public class UserIdGroupPair implements Comparable<UserIdGroupPair> {
    /**
     * {@inheritDoc}
     */
+   @Override
    public int compareTo(UserIdGroupPair o) {
       return (this == o) ? 0 : getUserId().compareTo(o.getUserId());
    }
diff --git a/apis/swift/src/main/java/org/jclouds/openstack/swift/domain/internal/ObjectInfoImpl.java b/apis/swift/src/main/java/org/jclouds/openstack/swift/domain/internal/ObjectInfoImpl.java
index bc46f22383..1a5eb11b70 100644
--- a/apis/swift/src/main/java/org/jclouds/openstack/swift/domain/internal/ObjectInfoImpl.java
+++ b/apis/swift/src/main/java/org/jclouds/openstack/swift/domain/internal/ObjectInfoImpl.java
@@ -164,6 +164,7 @@ public class ObjectInfoImpl implements ObjectInfo {
    /**
     * {@inheritDoc}
     */
+   @Override
    public String getName() {
       return this.name;
    }
@@ -172,6 +173,7 @@ public class ObjectInfoImpl implements ObjectInfo {
     * {@inheritDoc}
     */
    @Nullable
+   @Override
    public String getContainer() {
       return this.container;
    }
@@ -180,6 +182,7 @@ public class ObjectInfoImpl implements ObjectInfo {
     * {@inheritDoc}
     */
    @Nullable
+   @Override
    public URI getUri() {
       return this.uri;
    }
@@ -188,6 +191,7 @@ public class ObjectInfoImpl implements ObjectInfo {
     * {@inheritDoc}
     */
    @Nullable
+   @Override
    public byte[] getHash() {
       return this.hash;
    }
@@ -196,6 +200,7 @@ public class ObjectInfoImpl implements ObjectInfo {
     * {@inheritDoc}
     */
    @Nullable
+   @Override
    public Long getBytes() {
       return this.bytes;
    }
@@ -204,6 +209,7 @@ public class ObjectInfoImpl implements ObjectInfo {
     * {@inheritDoc}
     */
    @Nullable
+   @Override
    public String getContentType() {
       return this.contentType;
    }
@@ -212,6 +218,7 @@ public class ObjectInfoImpl implements ObjectInfo {
     * {@inheritDoc}
     */
    @Nullable
+   @Override
    public Date getLastModified() {
       return this.lastModified;
    }
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/CatalogImpl.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/CatalogImpl.java
index 5d0d16f015..4ad9caf5a7 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/CatalogImpl.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/CatalogImpl.java
@@ -86,6 +86,7 @@ public class CatalogImpl extends LinkedHashMap<String, ReferenceType> implements
    /**
     * {@inheritDoc}
     */
+   @Override
    public String getDescription() {
       return description;
    }
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/options/CloneVAppOptions.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/options/CloneVAppOptions.java
index 8aed313b18..23793efabc 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/options/CloneVAppOptions.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/options/CloneVAppOptions.java
@@ -72,9 +72,6 @@ public class CloneVAppOptions extends CloneOptions {
          return new CloneVAppOptions().powerOn();
       }
 
-      /**
-       * {@inheritDoc}
-       */
       public static CloneVAppOptions description(String description) {
          return new CloneVAppOptions().description(description);
       }
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/options/CloneVAppTemplateOptions.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/options/CloneVAppTemplateOptions.java
index e10d45dc76..d0332eac53 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/options/CloneVAppTemplateOptions.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/options/CloneVAppTemplateOptions.java
@@ -26,9 +26,6 @@ public class CloneVAppTemplateOptions extends CloneOptions {
    }
 
    public static class Builder {
-      /**
-       * {@inheritDoc}
-       */
       public static CloneVAppTemplateOptions description(String description) {
          return new CloneVAppTemplateOptions().description(description);
       }
diff --git a/blobstore/src/main/java/org/jclouds/blobstore/options/ListContainerOptions.java b/blobstore/src/main/java/org/jclouds/blobstore/options/ListContainerOptions.java
index aeb1e5901b..d366e2a51b 100644
--- a/blobstore/src/main/java/org/jclouds/blobstore/options/ListContainerOptions.java
+++ b/blobstore/src/main/java/org/jclouds/blobstore/options/ListContainerOptions.java
@@ -145,6 +145,7 @@ public class ListContainerOptions extends ListOptions implements Cloneable {
    /**
     * {@inheritDoc}
     */
+   @Override
    public ListContainerOptions afterMarker(String marker) {
       return (ListContainerOptions) super.afterMarker(marker);
    }
@@ -152,6 +153,7 @@ public class ListContainerOptions extends ListOptions implements Cloneable {
    /**
     * {@inheritDoc}
     */
+   @Override
    public ListContainerOptions maxResults(int maxKeys) {
       return (ListContainerOptions) super.maxResults(maxKeys);
    }
diff --git a/compute/src/main/java/org/jclouds/net/domain/IpPermission.java b/compute/src/main/java/org/jclouds/net/domain/IpPermission.java
index fa2cea6bed..6ae7209451 100644
--- a/compute/src/main/java/org/jclouds/net/domain/IpPermission.java
+++ b/compute/src/main/java/org/jclouds/net/domain/IpPermission.java
@@ -168,6 +168,7 @@ public class IpPermission implements Comparable<IpPermission> {
    /**
     * {@inheritDoc}
     */
+   @Override
    public int compareTo(IpPermission o) {
       return (this == o) ? 0 : getIpProtocol().compareTo(o.getIpProtocol());
    }
diff --git a/compute/src/main/java/org/jclouds/ovf/Envelope.java b/compute/src/main/java/org/jclouds/ovf/Envelope.java
index 85aded1baa..055d56b6d1 100644
--- a/compute/src/main/java/org/jclouds/ovf/Envelope.java
+++ b/compute/src/main/java/org/jclouds/ovf/Envelope.java
@@ -30,6 +30,7 @@ public class Envelope extends BaseEnvelope<VirtualSystem, Envelope> {
    /**
     * {@inheritDoc}
     */
+   @Override
    public Builder toBuilder() {
       return new Builder().fromEnvelope(this);
    }
@@ -39,6 +40,7 @@ public class Envelope extends BaseEnvelope<VirtualSystem, Envelope> {
       /**
        * {@inheritDoc}
        */
+      @Override
       public Envelope build() {
          return new Envelope(diskSections, networkSections, additionalSections, virtualSystem);
       }
diff --git a/compute/src/main/java/org/jclouds/ovf/internal/BaseEnvelope.java b/compute/src/main/java/org/jclouds/ovf/internal/BaseEnvelope.java
index 78a87947c8..bda96edb51 100644
--- a/compute/src/main/java/org/jclouds/ovf/internal/BaseEnvelope.java
+++ b/compute/src/main/java/org/jclouds/ovf/internal/BaseEnvelope.java
@@ -36,9 +36,6 @@ public class BaseEnvelope<V extends BaseVirtualSystem<V>, E extends BaseEnvelope
       return new Builder<V, E>();
    }
 
-   /**
-    * {@inheritDoc}
-    */
    public Builder<V, E> toBuilder() {
       return new Builder<V, E>().fromEnvelope(this);
    }
@@ -109,9 +106,6 @@ public class BaseEnvelope<V extends BaseVirtualSystem<V>, E extends BaseEnvelope
          return this;
       }
 
-      /**
-       * {@inheritDoc}
-       */
       @SuppressWarnings("unchecked")
       public E build() {
          return (E) new BaseEnvelope<V, E>(diskSections, networkSections, additionalSections, virtualSystem);
diff --git a/core/src/main/java/org/jclouds/http/options/BaseHttpRequestOptions.java b/core/src/main/java/org/jclouds/http/options/BaseHttpRequestOptions.java
index 776df12451..7e5d918cf3 100644
--- a/core/src/main/java/org/jclouds/http/options/BaseHttpRequestOptions.java
+++ b/core/src/main/java/org/jclouds/http/options/BaseHttpRequestOptions.java
@@ -61,6 +61,7 @@ public class BaseHttpRequestOptions implements HttpRequestOptions {
    /**
     * {@inheritDoc}
     */
+   @Override
    public Multimap<String, String> buildRequestHeaders() {
       return headers;
    }
@@ -68,6 +69,7 @@ public class BaseHttpRequestOptions implements HttpRequestOptions {
    /**
     * {@inheritDoc}
     */
+   @Override
    public Multimap<String, String> buildQueryParameters() {
       return queryParameters;
    }
diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/MutableBlobPropertiesImpl.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/MutableBlobPropertiesImpl.java
index 8259636705..67fd62a55d 100644
--- a/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/MutableBlobPropertiesImpl.java
+++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/MutableBlobPropertiesImpl.java
@@ -71,7 +71,7 @@ public class MutableBlobPropertiesImpl implements MutableBlobProperties {
    }
 
    /**
-    *{@inheritDoc}
+    * Set the blob type.
     */
    public void setType(BlobType type) {
       this.type = type;
@@ -80,6 +80,7 @@ public class MutableBlobPropertiesImpl implements MutableBlobProperties {
    /**
     *{@inheritDoc}
     */
+   @Override
    public String getName() {
       return name;
    }
@@ -87,6 +88,7 @@ public class MutableBlobPropertiesImpl implements MutableBlobProperties {
    /**
     *{@inheritDoc}
     */
+   @Override
    public Date getLastModified() {
       return lastModified;
    }
@@ -94,6 +96,7 @@ public class MutableBlobPropertiesImpl implements MutableBlobProperties {
    /**
     *{@inheritDoc}
     */
+   @Override
    public String getETag() {
       return eTag;
    }
@@ -101,6 +104,7 @@ public class MutableBlobPropertiesImpl implements MutableBlobProperties {
    /**
     *{@inheritDoc}
     */
+   @Override
    public int compareTo(BlobProperties o) {
       return (this == o) ? 0 : getName().compareTo(o.getName());
    }
@@ -108,6 +112,7 @@ public class MutableBlobPropertiesImpl implements MutableBlobProperties {
    /**
     *{@inheritDoc}
     */
+   @Override
    public Map<String, String> getMetadata() {
       return metadata;
    }
@@ -123,6 +128,7 @@ public class MutableBlobPropertiesImpl implements MutableBlobProperties {
    /**
     *{@inheritDoc}
     */
+   @Override
    public void setETag(String eTag) {
       this.eTag = eTag;
    }
@@ -130,6 +136,7 @@ public class MutableBlobPropertiesImpl implements MutableBlobProperties {
    /**
     *{@inheritDoc}
     */
+   @Override
    public void setName(String name) {
       this.name = name;
    }
@@ -137,6 +144,7 @@ public class MutableBlobPropertiesImpl implements MutableBlobProperties {
    /**
     *{@inheritDoc}
     */
+   @Override
    public void setLastModified(Date lastModified) {
       this.lastModified = lastModified;
    }
@@ -144,6 +152,7 @@ public class MutableBlobPropertiesImpl implements MutableBlobProperties {
    /**
     *{@inheritDoc}
     */
+   @Override
    public void setMetadata(Map<String, String> metadata) {
       this.metadata = metadata;
    }
diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/MutableContainerPropertiesWithMetadataImpl.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/MutableContainerPropertiesWithMetadataImpl.java
index f672025adb..a424b56da1 100644
--- a/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/MutableContainerPropertiesWithMetadataImpl.java
+++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/MutableContainerPropertiesWithMetadataImpl.java
@@ -44,6 +44,7 @@ public class MutableContainerPropertiesWithMetadataImpl implements
    /**
     *{@inheritDoc}
     */
+   @Override
    public String getName() {
       return name;
    }
@@ -51,6 +52,7 @@ public class MutableContainerPropertiesWithMetadataImpl implements
    /**
     *{@inheritDoc}
     */
+   @Override
    public Date getLastModified() {
       return lastModified;
    }
@@ -58,6 +60,7 @@ public class MutableContainerPropertiesWithMetadataImpl implements
    /**
     *{@inheritDoc}
     */
+   @Override
    public String getETag() {
       return eTag;
    }
@@ -65,6 +68,7 @@ public class MutableContainerPropertiesWithMetadataImpl implements
    /**
     *{@inheritDoc}
     */
+   @Override
    public int compareTo(ContainerProperties o) {
       return (this == o) ? 0 : getName().compareTo(o.getName());
    }
@@ -72,6 +76,7 @@ public class MutableContainerPropertiesWithMetadataImpl implements
    /**
     *{@inheritDoc}
     */
+   @Override
    public Map<String, String> getMetadata() {
       return metadata;
    }
@@ -79,6 +84,7 @@ public class MutableContainerPropertiesWithMetadataImpl implements
    /**
     *{@inheritDoc}
     */
+   @Override
    public void setETag(String eTag) {
       this.eTag = eTag;
    }
@@ -86,6 +92,7 @@ public class MutableContainerPropertiesWithMetadataImpl implements
    /**
     *{@inheritDoc}
     */
+   @Override
    public void setName(String name) {
       this.name = name;
    }
@@ -93,6 +100,7 @@ public class MutableContainerPropertiesWithMetadataImpl implements
    /**
     *{@inheritDoc}
     */
+   @Override
    public void setLastModified(Date lastModified) {
       this.lastModified = lastModified;
    }
@@ -100,6 +108,7 @@ public class MutableContainerPropertiesWithMetadataImpl implements
    /**
     *{@inheritDoc}
     */
+   @Override
    public void setMetadata(Map<String, String> metadata) {
       this.metadata = metadata;
    }
diff --git a/resources/checkstyle.xml b/resources/checkstyle.xml
index c30943d8e1..40e734b9b4 100644
--- a/resources/checkstyle.xml
+++ b/resources/checkstyle.xml
@@ -36,6 +36,7 @@
             <property name="max" value="120"/>
         </module>
 -->
+        <module name="MissingOverride"/>
         <module name="ModifierOrder"/>
         <module name="MultipleVariableDeclarations"/>
         <module name="NoWhitespaceAfter">