diff --git a/config/checkstyle.xml b/config/checkstyle.xml
index 47e29b5f4..41dfb16cf 100644
--- a/config/checkstyle.xml
+++ b/config/checkstyle.xml
@@ -22,6 +22,12 @@
 		<property name="format" value="^\s+$"/>
 		<property name="message" value="Line containing only whitespace character(s)"/>
 	</module>
+	<!-- TODO enable this once eclilpse does no longer add javadoc with trailing whitespaces
+	<module name="RegexpSingleline">
+		<property name="format" value="^.*\S+\s+$"/>
+		<property name="message" value="Line containing trailing whitespace character(s)"/>
+	</module>
+	-->
 	<module name="TreeWalker">
 		<module name="UnusedImports">
 			<property name="processJavadoc" value="true"/>