diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f7bbfbd17fda263e2456f1c4161a98553e71a9b..2efb2b706f39ff8122b26adb1934082fa9f77977 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## [Unreleased]
 ### Added
+- Commenter for aspect files.
 
 ### Changed
 
diff --git a/src/main/java/org/jastadd/tooling/aspect/AspectCommenter.java b/src/main/java/org/jastadd/tooling/aspect/AspectCommenter.java
new file mode 100644
index 0000000000000000000000000000000000000000..46a5a745abd1812594b246854ec20875b56e9b17
--- /dev/null
+++ b/src/main/java/org/jastadd/tooling/aspect/AspectCommenter.java
@@ -0,0 +1,39 @@
+package org.jastadd.tooling.aspect;
+
+
+import com.intellij.lang.Commenter;
+import org.jetbrains.annotations.Nullable;
+
+public class AspectCommenter 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 d84dd364f37c819a7929e7af627878c00d78fbf6..790753065fe93e1a481a7da7ede966be90e57736 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -93,6 +93,9 @@
         <lang.foldingBuilder language="JastAddAspect" implementationClass="org.jastadd.tooling.aspect.AspectFoldingBuilder"/>
 
         <lang.psiStructureViewFactory language="JastAddAspect" implementationClass="org.jastadd.tooling.aspect.AspectStructureViewFactory"/>
+
+        <lang.commenter language="JastAddAspect" implementationClass="org.jastadd.tooling.aspect.AspectCommenter"/>
+
     </extensions>
 
     <actions>