diff --git a/.gitignore b/.gitignore
index 235f69d3d..d728d479c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,5 @@ target/
 bin/
 out/
 eclipse_plugin/lib/
+
+*.versionsBackup
diff --git a/README.md b/README.md
index b90dc4a91..f838573b6 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,13 @@
+# FORK. FORK. FORK.
+
+This is a fork of the project with some additional patches applied:
+
+* [does not reflow markdown comments](https://github.com/google/google-java-format/pull/1231)
+
+It has different maven coordinates (`com.carrotsearch.googlejavaformat`).
+
+Most of the time, you'll be happier with the original version.
+
 # google-java-format
 
 `google-java-format` is a program that reformats Java source code to comply with
diff --git a/core/pom.xml b/core/pom.xml
index d3235cb18..ac6d8ab11 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -20,7 +20,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>com.google.googlejavaformat</groupId>
+    <groupId>com.carrotsearch.googlejavaformat</groupId>
     <artifactId>google-java-format-parent</artifactId>
   <version>HEAD-SNAPSHOT</version>
   </parent>
diff --git a/core/src/main/java/com/google/googlejavaformat/java/JavaCommentsHelper.java b/core/src/main/java/com/google/googlejavaformat/java/JavaCommentsHelper.java
index 7c6e42958..e93a92735 100644
--- a/core/src/main/java/com/google/googlejavaformat/java/JavaCommentsHelper.java
+++ b/core/src/main/java/com/google/googlejavaformat/java/JavaCommentsHelper.java
@@ -67,6 +67,13 @@ public String rewrite(Tok tok, int maxWidth, int column0) {
         lines.add(CharMatcher.whitespace().trimTrailingFrom(it.next()));
       }
     }
+
+    // Crude but works. Don't touch markdown-like line comments, even if they're
+    // somewhere in the code (and are not markdown).
+    if (lines.stream().allMatch(line -> line.startsWith("///"))) {
+      return preserveIndentation(lines, column0);
+    }
+
     if (tok.isSlashSlashComment()) {
       return indentLineComments(tok, lines, column0);
     }
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/B38241237.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B38241237.output
index 3dcebb13a..ed3e5b33d 100644
--- a/core/src/test/resources/com/google/googlejavaformat/java/testdata/B38241237.output
+++ b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B38241237.output
@@ -3,6 +3,6 @@ class B38241237 {
   // bar
   // one long incredibly unbroken sentence moving from topic to topic so that no-one had a chance to
   // interrupt
-  /// baz
+  ///baz
   ////
 }
diff --git a/eclipse_plugin/pom.xml b/eclipse_plugin/pom.xml
index a4028d242..abe2453b4 100644
--- a/eclipse_plugin/pom.xml
+++ b/eclipse_plugin/pom.xml
@@ -19,7 +19,7 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>com.google.googlejavaformat</groupId>
+  <groupId>com.carrotsearch.googlejavaformat</groupId>
   <artifactId>google-java-format-eclipse-plugin</artifactId>
   <packaging>eclipse-plugin</packaging>
   <version>1.31.0</version>
diff --git a/pom.xml b/pom.xml
index 23f1c4a15..cdb219775 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>com.google.googlejavaformat</groupId>
+  <groupId>com.carrotsearch.googlejavaformat</groupId>
   <artifactId>google-java-format-parent</artifactId>
   <packaging>pom</packaging>
   <version>HEAD-SNAPSHOT</version>