diff -Nru metainf-services-1.2/debian/changelog metainf-services-1.3/debian/changelog
--- metainf-services-1.2/debian/changelog	2011-10-20 14:16:55.000000000 +0000
+++ metainf-services-1.3/debian/changelog	2012-01-25 05:43:24.000000000 +0000
@@ -1,8 +1,14 @@
-metainf-services (1.2-1fakesync1) precise; urgency=low
+metainf-services (1.3-1) unstable; urgency=low
 
-  * Fake sync due to mismatching orig tarball.
+  [James Page]
+  * New upstream release.
+  * Updated my email address.
+  * Tidied lintian warnings.
 
- -- James Page <james.page@ubuntu.com>  Thu, 20 Oct 2011 15:16:55 +0100
+  [tony mancill]
+  * Set DMUA flag.
+
+ -- James Page <james.page@ubuntu.com>  Wed, 11 Jan 2012 18:30:29 +0100
 
 metainf-services (1.2-1) unstable; urgency=low
 
diff -Nru metainf-services-1.2/debian/control metainf-services-1.3/debian/control
--- metainf-services-1.2/debian/control	2011-10-20 14:16:55.000000000 +0000
+++ metainf-services-1.3/debian/control	2012-01-25 05:43:24.000000000 +0000
@@ -1,9 +1,9 @@
 Source: metainf-services
 Section: java
 Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: James Page <james.page@canonical.com>
+Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
+Uploaders: James Page <james.page@ubuntu.com>
+DM-Upload-Allowed: yes
 Build-Depends: cdbs, debhelper (>= 7), default-jdk, maven-debian-helper
 Build-Depends-Indep:
  default-jdk-doc,
diff -Nru metainf-services-1.2/debian/copyright metainf-services-1.3/debian/copyright
--- metainf-services-1.2/debian/copyright	2011-06-28 09:12:12.000000000 +0000
+++ metainf-services-1.3/debian/copyright	2012-01-25 05:43:24.000000000 +0000
@@ -1,6 +1,6 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
-Name: META-INF/services generator
-Maintainer: Kohsuke Kawaguchi
+Format: http://dep.debian.net/deps/dep5/
+Upstream-Name: META-INF/services generator
+Upstream-Contact: Kohsuke Kawaguchi
 Source: http://java.net/projects/metainf-services
 
 Files: *
diff -Nru metainf-services-1.2/.gitignore metainf-services-1.3/.gitignore
--- metainf-services-1.2/.gitignore	1970-01-01 00:00:00.000000000 +0000
+++ metainf-services-1.3/.gitignore	2011-12-01 19:29:00.000000000 +0000
@@ -0,0 +1 @@
+/target/
\ No newline at end of file
diff -Nru metainf-services-1.2/pom.xml metainf-services-1.3/pom.xml
--- metainf-services-1.2/pom.xml	2011-06-27 19:41:15.000000000 +0000
+++ metainf-services-1.3/pom.xml	2011-12-01 19:29:00.000000000 +0000
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.kohsuke.metainf-services</groupId>
   <artifactId>metainf-services</artifactId>
-  <version>1.2</version>  
+  <version>1.3</version>  
   <name>META-INF/services generator</name>
   <description>Annotation-driven META-INF/services auto-generation</description>
   <url>http://metainf-srvices.kohsuke.org/</url>
@@ -83,13 +83,6 @@
     </license>
   </licenses>
 
-  <repositories>
-    <repository>
-      <id>m.g.o-public</id>
-      <url>http://maven.glassfish.org/content/groups/public/</url>
-    </repository>
-  </repositories>
-
   <profiles> 
     <profile> 
       <id>release</id> 
diff -Nru metainf-services-1.2/src/main/java/org/kohsuke/metainf_services/AnnotationProcessorImpl.java metainf-services-1.3/src/main/java/org/kohsuke/metainf_services/AnnotationProcessorImpl.java
--- metainf-services-1.2/src/main/java/org/kohsuke/metainf_services/AnnotationProcessorImpl.java	2011-06-27 19:41:15.000000000 +0000
+++ metainf-services-1.3/src/main/java/org/kohsuke/metainf_services/AnnotationProcessorImpl.java	2011-12-01 19:29:00.000000000 +0000
@@ -43,7 +43,6 @@
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -67,8 +66,12 @@
         Map<String,Set<String>> services = new HashMap<String, Set<String>>();
 
         // discover services from the current compilation sources
-        for (TypeElement type : (Collection<TypeElement>)roundEnv.getElementsAnnotatedWith(MetaInfServices.class)) {
-            TypeElement contract = getContract(type);
+        for (Element e : roundEnv.getElementsAnnotatedWith(MetaInfServices.class)) {
+            MetaInfServices a = e.getAnnotation(MetaInfServices.class);
+            if(a==null) continue; // input is malformed, ignore
+            if (!e.getKind().isClass() && !e.getKind().isInterface()) continue; // ditto
+            TypeElement type = (TypeElement)e;
+            TypeElement contract = getContract(type, a);
             if(contract==null)  continue; // error should have already been reported
 
             String cn = contract.getQualifiedName().toString();
@@ -114,10 +117,9 @@
         return false;
     }
 
-    private TypeElement getContract(TypeElement type) {
+    private TypeElement getContract(TypeElement type, MetaInfServices a) {
         // explicitly specified?
         try {
-            MetaInfServices a = type.getAnnotation(MetaInfServices.class);
             a.value();
             throw new AssertionError();
         } catch (MirroredTypeException e) {
diff -Nru metainf-services-1.2/src/site/site.xml metainf-services-1.3/src/site/site.xml
--- metainf-services-1.2/src/site/site.xml	2011-06-27 19:41:15.000000000 +0000
+++ metainf-services-1.3/src/site/site.xml	2011-12-01 19:29:00.000000000 +0000
@@ -10,10 +10,10 @@
     <menu name="META-INF/services generator">
       <item name="Usage" href="index.html"/>
 
-      <!--item name="Dwonload" href="http://download.java.net/maven/2/org/kohsuke/metainf-services/metainf-services/"/-->
+      <item name="Download"               href="http://mvnrepository.com/artifact/${project.groupId}/${project.artifactId}"/>
       <item name="Source code" href="https://github.com/kohsuke/metainf-services"/>
       <item name="Issues" href="http://java.net/jira/browse/METAINF_SERVICES"/>
     </menu>
     ${reports}
   </body>
-</project>
\ No newline at end of file
+</project>