diff --git a/PowerEditor/installer/APIs/coffee.xml b/PowerEditor/installer/APIs/coffee.xml
new file mode 100644
index 000000000..dc6636a74
--- /dev/null
+++ b/PowerEditor/installer/APIs/coffee.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="Windows-1252" ?>
+<NotepadPlus>
+		<AutoComplete>
+			<KeyWord name="arguments" />
+			<KeyWord name="and" />
+			<KeyWord name="await" />
+			<KeyWord name="break" />
+			<KeyWord name="by" />
+			<KeyWord name="catch" />
+			<KeyWord name="class" />
+			<KeyWord name="continue" />
+			<KeyWord name="default" />
+			<KeyWord name="defer" />
+			<KeyWord name="delete" />
+			<KeyWord name="do" />
+			<KeyWord name="else" />
+			<KeyWord name="extends" />
+			<KeyWord name="false" />
+			<keyWord name="finally" />
+			<KeyWord name="for" />
+			<KeyWord name="if" />
+			<KeyWord name="in" />
+			<KeyWord name="is" />
+			<KeyWord name="isnt" />
+			<KeyWord name="Infinity" />
+			<KeyWord name="instanceof" />
+			<KeyWord name="loop" />
+			<KeyWord name="new" />
+			<keyWord name="not" />
+			<KeyWord name="null" />
+			<KeyWord name="NaN" />
+			<KeyWord name="of" />
+			<KeyWord name="or" />
+			<KeyWord name="on" />
+			<keyWord name="no" />
+			<KeyWord name="return" />
+			<KeyWord name="switch" />
+			<keyWord name="super" />
+			<KeyWord name="then" />
+			<KeyWord name="this" />
+			<KeyWord name="throw" />
+			<KeyWord name="true" />
+			<KeyWord name="try" />
+			<KeyWord name="typeof" />
+			<KeyWord name="undefined" />
+			<KeyWord name="unless" />
+			<KeyWord name="when" />
+			<KeyWord name="while" />
+			<keyWord name="yes" />
+			<KeyWord name="yield" />
+			<keyWord name="=>" />
+			<keyWord name="->" />
+		</AutoComplete>
+</NotepadPlus>
\ No newline at end of file
diff --git a/PowerEditor/installer/nsisInclude/autoCompletion.nsh b/PowerEditor/installer/nsisInclude/autoCompletion.nsh
index 1806b400a..a039e41d1 100644
--- a/PowerEditor/installer/nsisInclude/autoCompletion.nsh
+++ b/PowerEditor/installer/nsisInclude/autoCompletion.nsh
@@ -133,6 +133,11 @@ SectionGroup "Auto-completion Files" autoCompletionComponent
 		SetOutPath "$INSTDIR\plugins\APIs"
 		File ".\APIs\batch.xml"
 	${MementoSectionEnd}
+	
+	${MementoSection} "CoffeeScript" CoffeeScript
+		SetOutPath "$INSTDIR\plugins\APIs"
+		File ".\APIs\coffee.xml"
+	${MementoSectionEnd}
 SectionGroupEnd
 
 
@@ -221,4 +226,8 @@ SectionGroup un.autoCompletionComponent
 	Section un.BATCH
 		Delete "$INSTDIR\plugins\APIs\batch.xml"
 	SectionEnd
+	
+	Section un.CoffeeScript
+		Delete "$INSTDIR\plugins\APIs\coffee.xml"
+	SectionEnd
 SectionGroupEnd