diff --git a/scm-annotation-processor/src/main/java/sonia/scm/annotation/ScmAnnotationProcessor.java b/scm-annotation-processor/src/main/java/sonia/scm/annotation/ScmAnnotationProcessor.java
index c548f30d45..7ef632a3b0 100644
--- a/scm-annotation-processor/src/main/java/sonia/scm/annotation/ScmAnnotationProcessor.java
+++ b/scm-annotation-processor/src/main/java/sonia/scm/annotation/ScmAnnotationProcessor.java
@@ -99,6 +99,8 @@ import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
+import static javax.lang.model.util.ElementFilter.methodsIn;
+
 /**
  *
  * @author Sebastian Sdorra
@@ -372,6 +374,15 @@ public final class ScmAnnotationProcessor extends AbstractProcessor {
           attributes.put(entry.getKey().getSimpleName().toString(),
             getValue(entry.getValue()));
         }
+
+        // add default values
+        for (ExecutableElement meth : methodsIn(am.getAnnotationType().asElement().getEnclosedElements())) {
+          String attribute = meth.getSimpleName().toString();
+          AnnotationValue defaultValue = meth.getDefaultValue();
+          if (defaultValue != null && !attributes.containsKey(attribute)) {
+            attributes.put(attribute, getValue(defaultValue));
+          }
+        }
       }
     }