diff --git a/build/analysis/BUILD.bazel b/build/analysis/BUILD.bazel
index edaefbe..621e30b 100644
--- a/build/analysis/BUILD.bazel
+++ b/build/analysis/BUILD.bazel
@@ -33,5 +33,13 @@
     name = "nogo",
     config = "nogo_config.json",
     visibility = ["//visibility:public"],
-    deps = govet,
+    deps = govet + [
+        # This analyzer ensures that all comment lines are <= 80 characters long
+        # in Go source. This is in line with general practices around the Go
+        # community, where code lines can be as long as needed (and is expected
+        # to be soft-reflowable by text editors), but comments are kept at a
+        # 'standard' 80 characters long, as prose within comment blocks does not
+        # soft-reflow well.
+        "@com_github_corverroos_commentwrap//:go_tool_library",
+    ],
 )
diff --git a/build/analysis/nogo_config.json b/build/analysis/nogo_config.json
index c13baaf..ae01f0a 100644
--- a/build/analysis/nogo_config.json
+++ b/build/analysis/nogo_config.json
@@ -88,5 +88,11 @@
       "external/com_github_google_gvisor/": "third_party",
       "external/com_github_sbezverk_nfproxy/": "third_party"
     }
+  },
+  "commentwrap": {
+    "exclude_files": {
+      "dev_source_monogon/": "temporary until fixup CR",
+      "external/": "third_party"
+    }
   }
 }
diff --git a/build/fietsje/main.go b/build/fietsje/main.go
index 1345644..50055ab 100644
--- a/build/fietsje/main.go
+++ b/build/fietsje/main.go
@@ -135,6 +135,18 @@
 	// goimports
 	p.collectOverride("golang.org/x/tools", "v0.0.0-20201215171152-6307297f4651")
 
+	// commentwrap is used as a nogo analyzer to stick to a maximum line
+	// length for comments.
+	// We have to patch both it and its only direct dependency to add generated
+	// go_tool_library targets. This is needed as Gazelle doesn't generate them,
+	// because they're a temporary solution to a problem that shouldn't exist soon:
+	// https://github.com/bazelbuild/rules_go/issues/2374
+	p.collect("github.com/corverroos/commentwrap", "2926638be44ce0c6c0ee2471e9b5ad9473c984cd",
+		patches("commentwrap-tool-library.patch"),
+	).with(patches("reflow-tool-library.patch")).use(
+		"github.com/muesli/reflow",
+	)
+
 	// First generate the repositories starlark rule into memory. This is because rendering will lock all unlocked
 	// dependencies, which might take a while. If a use were to interrupt it now, they would end up with an incomplete
 	// repositories.bzl and would have to restore from git.