diff --git a/Makefile b/Makefile
index 6825372..4fc8a42 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,20 @@
 test.local:
 	bazel test all_local_tests
 
+ktlint.check:
+	bazel test //... --test_tag_filters="ktlint" --test_output=errors
+ktlint.fix:
+	bazel run //src/main/kotlin/io/bazel/kotlin/builder/cmd:build_lib_ktlint_fix
+	bazel run //src/main/kotlin/io/bazel/kotlin/builder/cmd:merge_jdeps_lib_ktlint_fix
+	bazel run //src/main/kotlin/io/bazel/kotlin/builder/tasks:tasks_ktlint_fix
+	bazel run //src/main/kotlin/io/bazel/kotlin/builder/toolchain:toolchain_ktlint_fix
+	bazel run //src/main/kotlin/io/bazel/kotlin/builder/utils:utils_ktlint_fix
+	bazel run //src/main/kotlin/io/bazel/kotlin/builder/utils/jars:jars_ktlint_fix
+	bazel run //src/main/kotlin/io/bazel/kotlin/compiler:compiler_ktlint_fix
+	bazel run //src/main/kotlin/io/bazel/kotlin/plugin:skip-code-gen-lib_ktlint_fix
+	bazel run //src/main/kotlin/io/bazel/kotlin/plugin/jdeps:jdeps-gen-lib_ktlint_fix
+	bazel run //src/main/kotlin/io/bazel/worker:worker_ktlint_fix
+
 test.no_worker:
 	bazel clean
 	bazel shutdown