diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index 5eb174f..e36cf2e 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -8,9 +8,11 @@
       <property name="file" value="${config_loc}/suppressions.xml"/>
   </module>
 
-  <!-- <module name="FileTabCharacter"/> -->
+  <module name="FileTabCharacter"/>
 
   <module name="TreeWalker">
-    <!-- <module name="Indentation"/> -->
+    <module name="Indentation">
+      <property name="basicOffset" value="2"/>
+    </module>
   </module>
 </module>
diff --git a/config/checkstyle/suppressions.xml b/config/checkstyle/suppressions.xml
index 0755c89..c1d43b6 100644
--- a/config/checkstyle/suppressions.xml
+++ b/config/checkstyle/suppressions.xml
@@ -5,4 +5,11 @@
   "https://checkstyle.org/dtds/suppressions_1_2.dtd">
 
 <suppressions>
+  <suppress files="brouter-codec/.*" checks=".*"/>
+  <suppress files="brouter-core/.*" checks=".*"/>
+  <suppress files="brouter-expressions/.*" checks=".*"/>
+  <suppress files="brouter-map-creator/.*" checks=".*"/>
+  <suppress files="brouter-mapaccess/.*" checks=".*"/>
+  <suppress files="brouter-server/.*" checks=".*"/>
+  <suppress files="brouter-util/.*" checks=".*"/>
 </suppressions>