diff --git a/eclipsecs-sevntu-plugin/src/checkstyle_packages.xml b/eclipsecs-sevntu-plugin/src/checkstyle_packages.xml
index 548ff7ec08..e0dcf7c99d 100644
--- a/eclipsecs-sevntu-plugin/src/checkstyle_packages.xml
+++ b/eclipsecs-sevntu-plugin/src/checkstyle_packages.xml
@@ -15,6 +15,7 @@
+
diff --git a/eclipsecs-sevntu-plugin/src/com/github/sevntu/checkstyle/checks/jsr305/checkstyle-metadata.properties b/eclipsecs-sevntu-plugin/src/com/github/sevntu/checkstyle/checks/jsr305/checkstyle-metadata.properties
new file mode 100755
index 0000000000..ed52855a1f
--- /dev/null
+++ b/eclipsecs-sevntu-plugin/src/com/github/sevntu/checkstyle/checks/jsr305/checkstyle-metadata.properties
@@ -0,0 +1,6 @@
+Jsr305AnnotationsCheck.name=Jsr305AnnotationsCheck
+Jsr305AnnotationsCheck.desc=Checks method parameters and return values for the presence of @Nonnull, @Nullable, or @CheckForNull annotations.
+Jsr305AnnotationsCheck.packages=Packages to be checked.
+Jsr305AnnotationsCheck.excludePackages=Packages excluded from checking.
+Jsr305AnnotationsCheck.allowOverridingReturnValue=Allow Overriding return values, useful for upgrading.
+Jsr305AnnotationsCheck.allowOverridingParameter=Allow Overriding paramaters, useful for upgrading.
diff --git a/eclipsecs-sevntu-plugin/src/com/github/sevntu/checkstyle/checks/jsr305/checkstyle-metadata.xml b/eclipsecs-sevntu-plugin/src/com/github/sevntu/checkstyle/checks/jsr305/checkstyle-metadata.xml
new file mode 100644
index 0000000000..b8687b4ff6
--- /dev/null
+++ b/eclipsecs-sevntu-plugin/src/com/github/sevntu/checkstyle/checks/jsr305/checkstyle-metadata.xml
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+
+ %Jsr305AnnotationsCheck.desc
+
+ %Jsr305AnnotationsCheck.packages
+
+
+ %Jsr305AnnotationsCheck.excludePackages
+
+
+ %Jsr305AnnotationsCheck.allowOverridingReturnValue
+
+
+ %Jsr305AnnotationsCheck.allowOverridingParameter
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sevntu-checks/pom.xml b/sevntu-checks/pom.xml
index 971587eadc..0629f68a1e 100644
--- a/sevntu-checks/pom.xml
+++ b/sevntu-checks/pom.xml
@@ -42,6 +42,17 @@
test
${checkstyle.eclipse-cs.version}
+
+
+ com.google.code.findbugs
+ jsr305
+ 3.0.1
+
+
+ com.google.code.findbugs
+ annotations
+ 3.0.1
+
junit
junit
diff --git a/sevntu-checks/sevntu-checks.xml b/sevntu-checks/sevntu-checks.xml
index d4c7612e18..f327bee93b 100644
--- a/sevntu-checks/sevntu-checks.xml
+++ b/sevntu-checks/sevntu-checks.xml
@@ -216,6 +216,14 @@
+
+
+
+
+
+
+
+
+
+ com.github.sevntu.checkstyle.checks.jsr305.Jsr305AnnotationsCheck
+ Line Length Extended
+
+ Checks for long lines.
+ Checker/TreeWalker/com.github.sevntu.checkstyle.checks.jsr305.Jsr305AnnotationsCheck
+
+
+
+ Packages to be checked.
+
+
+
+ Packages excluded from checking.
+
+
+ false
+ Allow Overriding return values, useful for upgrading.
+
+
+ false
+ Allow Overriding paramaters, useful for upgrading.
+
+
+
com.github.sevntu.checkstyle.checks.sizes.LineLengthExtendedCheck