diff --git a/.jcheck/conf b/.jcheck/conf
index 40d53c860d5..42c3716369e 100644
--- a/.jcheck/conf
+++ b/.jcheck/conf
@@ -14,7 +14,8 @@ version=0
 domain=openjdk.org
 
 [checks "whitespace"]
-files=.*\.cpp|.*\.hpp|.*\.c|.*\.h|.*\.java|.*\.cc|.*\.hh|.*\.m|.*\.mm
+files=.*\.cpp|.*\.hpp|.*\.c|.*\.h|.*\.java|.*\.cc|.*\.hh|.*\.m|.*\.mm|.*\.gmk|.*\.m4|.*\.ac|Makefile
+ignore-tabs=.*\.gmk|Makefile
 
 [checks "merge"]
 message=Merge
diff --git a/make/autoconf/jvm-features.m4 b/make/autoconf/jvm-features.m4
index b45271641fb..b4e633401d9 100644
--- a/make/autoconf/jvm-features.m4
+++ b/make/autoconf/jvm-features.m4
@@ -159,7 +159,7 @@ AC_DEFUN_ONCE([JVM_FEATURES_PARSE_OPTIONS],
   # Likewise, check for deprecated arguments.
   m4_foreach(FEATURE, m4_split(jvm_features_deprecated), [
     AC_ARG_ENABLE(jvm-feature-FEATURE, AS_HELP_STRING(
-        [--enable-jvm-feature-FEATURE], 
+        [--enable-jvm-feature-FEATURE],
         [Deprecated. Option is kept for backwards compatibility and is ignored]))
 
     m4_define(FEATURE_SHELL, [enable_jvm_feature_]m4_translit(FEATURE, -, _))
diff --git a/make/modules/java.base/gendata/GendataCryptoPolicy.gmk b/make/modules/java.base/gendata/GendataCryptoPolicy.gmk
index e36a1b9fcb7..c63b36fe058 100644
--- a/make/modules/java.base/gendata/GendataCryptoPolicy.gmk
+++ b/make/modules/java.base/gendata/GendataCryptoPolicy.gmk
@@ -27,7 +27,7 @@
 # In pre-JDK9 releases, Oracle JDK has had a separately downloadable set
 # of policy files which has been a nightmare for deployment.
 #
-# We now create 2 complete initial sets of policy files and package into 
+# We now create 2 complete initial sets of policy files and package into
 # 2 different directories.  The crypto.policy Security property will select
 # the active policy.
 #