diff --git a/src/main/java/org/jastadd/tooling/RelAstGrammarCommenter.java b/src/main/java/org/jastadd/tooling/RelAstGrammarCommenter.java
new file mode 100644
index 0000000000000000000000000000000000000000..7196de88c2554631cc7bdb7961aca871142d5bd2
--- /dev/null
+++ b/src/main/java/org/jastadd/tooling/RelAstGrammarCommenter.java
@@ -0,0 +1,39 @@
+package org.jastadd.tooling;
+
+
+import com.intellij.lang.Commenter;
+  import org.jetbrains.annotations.Nullable;
+
+public class RelAstGrammarCommenter implements Commenter {
+
+  @Nullable
+  @Override
+  public String getLineCommentPrefix() {
+    return "//";
+  }
+
+  @Nullable
+  @Override
+  public String getBlockCommentPrefix() {
+    return "/*";
+  }
+
+  @Nullable
+  @Override
+  public String getBlockCommentSuffix() {
+    return "*/";
+  }
+
+  @Nullable
+  @Override
+  public String getCommentedBlockCommentPrefix() {
+    return null;
+  }
+
+  @Nullable
+  @Override
+  public String getCommentedBlockCommentSuffix() {
+    return null;
+  }
+
+}
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index 17362f084a33b376e7e2e962de5658089782a73e..ce813c6995c0b380f7114c7d75f4800214bcfe76 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -53,6 +53,8 @@
 
         <langCodeStyleSettingsProvider
             implementation="org.jastadd.tooling.RelAstGrammarLanguageCodeStyleSettingsProvider"/>
+
+        <lang.commenter language="JastAddGrammar" implementationClass="org.jastadd.tooling.RelAstGrammarCommenter"/>
     </extensions>
 
     <actions>