diff --git a/src/main/java/com/github/dweindl/intellijantimony/AntimonyCommenter.java b/src/main/java/com/github/dweindl/intellijantimony/AntimonyCommenter.java
new file mode 100644
index 0000000..aa19980
--- /dev/null
+++ b/src/main/java/com/github/dweindl/intellijantimony/AntimonyCommenter.java
@@ -0,0 +1,36 @@
+package com.github.dweindl.intellijantimony;
+
+import com.intellij.lang.Commenter;
+import org.jetbrains.annotations.Nullable;
+
+public class AntimonyCommenter 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;
+    }
+}
\ No newline at end of file
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index d861ca3..da591a0 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -25,6 +25,7 @@
         <lang.braceMatcher language="Antimony" implementationClass="com.github.dweindl.intellijantimony.AntimonyPairedBraceMatcher"/>
         <colorSettingsPage implementation="com.github.dweindl.intellijantimony.AntimonyColorSettingsPage"/>
         <!-- TODO: code folding -->
+        <lang.commenter language="Antimony" implementationClass="com.github.dweindl.intellijantimony.AntimonyCommenter"/>
     </extensions>
 
     <applicationListeners>