diff --git a/pmd-java/src/main/resources/rulesets/java/design.xml b/pmd-java/src/main/resources/rulesets/java/design.xml
index d8da57f7f9..001105d428 100644
--- a/pmd-java/src/main/resources/rulesets/java/design.xml
+++ b/pmd-java/src/main/resources/rulesets/java/design.xml
@@ -1830,6 +1830,15 @@ having to deal with the creation of an array.
[not (./Type/ReferenceType[@Array='true'][PrimitiveType[@Image='byte']])]
[not (./Type/ReferenceType[ClassOrInterfaceType[@Image='Byte']])]
[not (./Type/PrimitiveType[@Image='byte'])]
+ [not (ancestor::MethodDeclaration/preceding-sibling::Annotation/*/Name[@Image='Override'])]
+ [not(
+ ancestor::MethodDeclaration
+ [@Public='true' and @Static='true']
+ [child::ResultType[@Void='true']] and
+ ancestor::MethodDeclarator[@Image='main'] and
+ ..[@ParameterCount='1'] and
+ ./Type/ReferenceType[ClassOrInterfaceType[@Image='String']]
+ )]
]]>
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UseVarargs.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UseVarargs.xml
index 169b9cdd37..4e0ee4fd69 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UseVarargs.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UseVarargs.xml
@@ -82,6 +82,40 @@ method, do not varargs, allow Byte[] as not varargs
public class Foo {
public void bar(File file, Byte[] data) { }
public void bar2(File file, Byte data[]) { }
+}
+ ]]>
+
+
+
+ 0
+
+
+
+
+ 0
+
+
+
+
+ 1
+
diff --git a/src/site/markdown/overview/changelog.md b/src/site/markdown/overview/changelog.md
index 9b8db5c15e..bc203a04ca 100644
--- a/src/site/markdown/overview/changelog.md
+++ b/src/site/markdown/overview/changelog.md
@@ -8,8 +8,13 @@
**New/Modified/Deprecated Rules:**
+* java-design/UseVargs: public static void main method is ignored now and so are methods, that are annotated
+ with Override. See [PR#79](https://github.com/pmd/pmd/pull/79).
+
**Pull Requests:**
+* [#79](https://github.com/pmd/pmd/pull/79): do not flag public static void main(String[]) as UseVarargs; ignore @Override for UseVarargs
+
**Bugfixes:**
**API Changes:**