diff --git a/idea/META-INF/plugin.xml b/idea/META-INF/plugin.xml
index 21e3a71687c..4c19ef61452 100644
--- a/idea/META-INF/plugin.xml
+++ b/idea/META-INF/plugin.xml
@@ -20,6 +20,7 @@
       <fileTypeFactory implementation="org.jetbrains.jet.lang.JetFileFactory"/>
       <lang.braceMatcher language="jet" implementationClass="org.jetbrains.jet.lang.JetPairMatcher"/>
       <lang.parserDefinition language="jet" implementationClass="org.jetbrains.jet.lang.parsing.JetParserDefinition"/>
+      <lang.commenter language="jet" implementationClass="org.jetbrains.jet.plugin.JetCommenter"/>
       <annotator language="jet" implementationClass="org.jetbrains.jet.lang.annotations.SoftKeywordsAnnotator"/>
   </extensions>
 </idea-plugin>
diff --git a/idea/src/org/jetbrains/jet/plugin/JetCommenter.java b/idea/src/org/jetbrains/jet/plugin/JetCommenter.java
new file mode 100644
index 00000000000..5b4e3409842
--- /dev/null
+++ b/idea/src/org/jetbrains/jet/plugin/JetCommenter.java
@@ -0,0 +1,37 @@
+package org.jetbrains.jet.plugin;
+
+import com.intellij.lang.Commenter;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: max
+ * Date: 12/19/10
+ * Time: 5:45 PM
+ * To change this template use File | Settings | File Templates.
+ */
+public class JetCommenter implements Commenter {
+    @Override
+    public String getLineCommentPrefix() {
+        return "//";
+    }
+
+    @Override
+    public String getBlockCommentPrefix() {
+        return "/*";
+    }
+
+    @Override
+    public String getBlockCommentSuffix() {
+        return "*/";
+    }
+
+    @Override
+    public String getCommentedBlockCommentPrefix() {
+        return null;
+    }
+
+    @Override
+    public String getCommentedBlockCommentSuffix() {
+        return null;
+    }
+}