diff --git a/build-tools/pom.xml b/build-tools/pom.xml
index 1e052c4ee..caaee0628 100644
--- a/build-tools/pom.xml
+++ b/build-tools/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>fi.helsinki.cs.tmc</groupId>
     <artifactId>build-tools</artifactId>
-    <version>0.7.15-SNAPSHOT</version>
+    <version>0.7.16-SNAPSHOT</version>
     <name>build-tools</name>
 
     <!-- Deploy to maven.testmycode.net/nexus -->
diff --git a/build-tools/src/main/resources/checkstyle/tmc-checkstyle.xml b/build-tools/src/main/resources/checkstyle/tmc-checkstyle.xml
index 35c59a29e..7f20c7fa0 100644
--- a/build-tools/src/main/resources/checkstyle/tmc-checkstyle.xml
+++ b/build-tools/src/main/resources/checkstyle/tmc-checkstyle.xml
@@ -56,9 +56,6 @@
             <property name="tokens" value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
         </module>
         <module name="NeedBraces"/>
-        <module name="LeftCurly">
-            <property name="maxLineLength" value="100"/>
-        </module>
         <module name="RightCurly"/>
         <module name="RightCurly">
             <property name="option" value="alone"/>
@@ -153,12 +150,6 @@
         </module>
         <module name="OverloadMethodsDeclarationOrder"/>
         <module name="VariableDeclarationUsageDistance"/>
-        <module name="CustomImportOrder">
-            <property name="thirdPartyPackageRegExp" value=".*"/>
-            <property name="specialImportsRegExp" value="^fi.helsinki"/>
-            <property name="sortImportsInGroupAlphabetically" value="true"/>
-            <property name="customImportOrderRules" value="STATIC###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE###STANDARD_JAVA_PACKAGE"/>
-        </module>
         <module name="MethodParamPad"/>
         <module name="OperatorWrap">
             <property name="option" value="NL"/>
diff --git a/pom.xml b/pom.xml
index 7a1556f0b..8aed0e5de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>fi.helsinki.cs.tmc</groupId>
     <artifactId>tmc-langs</artifactId>
-    <version>0.7.15-SNAPSHOT</version>
+    <version>0.7.16-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>tmc-langs</name>
     <url>http://testmycode.net</url>
@@ -53,7 +53,7 @@
         <dependency>
             <groupId>com.puppycrawl.tools</groupId>
             <artifactId>checkstyle</artifactId>
-            <version>6.17</version>
+            <version>8.18</version>
         </dependency>
 
         <dependency>
@@ -113,12 +113,12 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-checkstyle-plugin</artifactId>
-                    <version>2.16</version>
+                    <version>3.1.0</version>
                     <dependencies>
                         <dependency>
                             <groupId>com.puppycrawl.tools</groupId>
                             <artifactId>checkstyle</artifactId>
-                            <version>6.17</version>
+                            <version>8.18</version>
                         </dependency>
                     </dependencies>
                 </plugin>
@@ -129,7 +129,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>2.15</version>
+                <version>3.1.0</version>
                 <inherited>true</inherited>
                 <dependencies>
                     <dependency>
diff --git a/tmc-langs-cli/pom.xml b/tmc-langs-cli/pom.xml
index 20736188a..6c21646cd 100644
--- a/tmc-langs-cli/pom.xml
+++ b/tmc-langs-cli/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>tmc-langs</artifactId>
         <groupId>fi.helsinki.cs.tmc</groupId>
-        <version>0.7.15-SNAPSHOT</version>
+        <version>0.7.16-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/tmc-langs-framework/pom.xml b/tmc-langs-framework/pom.xml
index c1bb25d69..36edbc1a5 100644
--- a/tmc-langs-framework/pom.xml
+++ b/tmc-langs-framework/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.helsinki.cs.tmc</groupId>
         <artifactId>tmc-langs</artifactId>
-        <version>0.7.15-SNAPSHOT</version>
+        <version>0.7.16-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <properties>
diff --git a/tmc-langs-java/pom.xml b/tmc-langs-java/pom.xml
index 86b29f1b8..68615aeb4 100644
--- a/tmc-langs-java/pom.xml
+++ b/tmc-langs-java/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.helsinki.cs.tmc</groupId>
         <artifactId>tmc-langs</artifactId>
-        <version>0.7.15-SNAPSHOT</version>
+        <version>0.7.16-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/tmc-langs-make/pom.xml b/tmc-langs-make/pom.xml
index 5d42516f4..86c718a35 100644
--- a/tmc-langs-make/pom.xml
+++ b/tmc-langs-make/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.helsinki.cs.tmc</groupId>
         <artifactId>tmc-langs</artifactId>
-        <version>0.7.15-SNAPSHOT</version>
+        <version>0.7.16-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/tmc-langs-notests/pom.xml b/tmc-langs-notests/pom.xml
index 9293d1e33..403b81d28 100644
--- a/tmc-langs-notests/pom.xml
+++ b/tmc-langs-notests/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.helsinki.cs.tmc</groupId>
         <artifactId>tmc-langs</artifactId>
-        <version>0.7.15-SNAPSHOT</version>
+        <version>0.7.16-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/tmc-langs-python3/pom.xml b/tmc-langs-python3/pom.xml
index f7f90b92c..37dab0471 100644
--- a/tmc-langs-python3/pom.xml
+++ b/tmc-langs-python3/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.helsinki.cs.tmc</groupId>
         <artifactId>tmc-langs</artifactId>
-        <version>0.7.15-SNAPSHOT</version>
+        <version>0.7.16-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/tmc-langs-qmake/pom.xml b/tmc-langs-qmake/pom.xml
index 152102ef6..8de7e1b0f 100644
--- a/tmc-langs-qmake/pom.xml
+++ b/tmc-langs-qmake/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.helsinki.cs.tmc</groupId>
         <artifactId>tmc-langs</artifactId>
-        <version>0.7.15-SNAPSHOT</version>
+        <version>0.7.16-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/tmc-langs-r/pom.xml b/tmc-langs-r/pom.xml
index 6081f1d1d..bb8e2279d 100644
--- a/tmc-langs-r/pom.xml
+++ b/tmc-langs-r/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.helsinki.cs.tmc</groupId>
         <artifactId>tmc-langs</artifactId>
-        <version>0.7.15-SNAPSHOT</version>
+        <version>0.7.16-SNAPSHOT</version>
     </parent>
     <artifactId>tmc-langs-r</artifactId>
     <packaging>jar</packaging>
diff --git a/tmc-langs-util/pom.xml b/tmc-langs-util/pom.xml
index 7ae474f94..fb1a7a60e 100644
--- a/tmc-langs-util/pom.xml
+++ b/tmc-langs-util/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.helsinki.cs.tmc</groupId>
         <artifactId>tmc-langs</artifactId>
-        <version>0.7.15-SNAPSHOT</version>
+        <version>0.7.16-SNAPSHOT</version>
     </parent>
     <artifactId>tmc-langs-util</artifactId>
     <packaging>jar</packaging>