diff --git a/idea/resources/liveTemplates/Kotlin.xml b/idea/resources/liveTemplates/Kotlin.xml
index 942f2910b7d..ffbd92d7fb3 100644
--- a/idea/resources/liveTemplates/Kotlin.xml
+++ b/idea/resources/liveTemplates/Kotlin.xml
@@ -6,6 +6,7 @@
             <option name="KOTLIN_NAMESPACE" value="true" />
         </context>
     </template>
+
     <template resource-bundle="messages.CodeInsightBundle" key="livetemplate.description.sout"
               name="sout" toReformat="true"
               ShortenFQNames="true" value="println($END$)">
@@ -35,4 +36,51 @@
             <option name="KOTLIN_STATEMENT" value="true"/>
         </context>
     </template>
+
+    <template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.void"
+              name="void" toReformat="true" toShortenFQNames="true" value="fun $NAME$($PARAMS$) {&#10;$END$&#10;}">
+        <variable alwaysStopAt="true" defaultValue="" expression="" name="NAME" />
+        <variable alwaysStopAt="true" defaultValue="" expression="" name="PARAMS" />
+        <context>
+            <option name="KOTLIN_STATEMENT" value="true"/>
+            <option name="KOTLIN_CLASS" value="true"/>
+            <option name="KOTLIN_NAMESPACE" value="true"/>
+        </context>
+    </template>
+    <template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.fun0"
+              name="fun0" toReformat="true" toShortenFQNames="true" value="fun $NAME$() : $RETURN$ {&#10;$END$&#10;}">
+        <variable alwaysStopAt="true" defaultValue="" expression="" name="NAME" />
+        <variable alwaysStopAt="true" defaultValue="&quot;Unit&quot;" expression="" name="RETURN" />
+        <context>
+            <option name="KOTLIN_STATEMENT" value="true"/>
+            <option name="KOTLIN_CLASS" value="true"/>
+            <option name="KOTLIN_NAMESPACE" value="true"/>
+        </context>
+    </template>
+    <template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.fun1"
+              name="fun1" toReformat="true" toShortenFQNames="true" value="fun $NAME$($PARAM1$ : $PARAM1TYPE$) : $RETURN$ {&#10;$END$&#10;}">
+        <variable alwaysStopAt="true" defaultValue="" expression="" name="NAME" />
+        <variable alwaysStopAt="true" defaultValue="&quot;x&quot;" expression="" name="PARAM1" />
+        <variable alwaysStopAt="true" defaultValue="&quot;Any&quot;" expression="" name="PARAM1TYPE" />
+        <variable alwaysStopAt="true" defaultValue="&quot;Unit&quot;" expression="" name="RETURN" />
+        <context>
+            <option name="KOTLIN_STATEMENT" value="true"/>
+            <option name="KOTLIN_CLASS" value="true"/>
+            <option name="KOTLIN_NAMESPACE" value="true"/>
+        </context>
+    </template>
+    <template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.fun2"
+              name="fun2" toReformat="true" toShortenFQNames="true" value="fun $NAME$($PARAM1$ : $PARAM1TYPE$, $PARAM2$ : $PARAM2TYPE$) : $RETURN$ {&#10;$END$&#10;}">
+        <variable alwaysStopAt="true" defaultValue="" expression="" name="NAME" />
+        <variable alwaysStopAt="true" defaultValue="&quot;x&quot;" expression="" name="PARAM1" />
+        <variable alwaysStopAt="true" defaultValue="&quot;Any&quot;" expression="" name="PARAM1TYPE" />
+        <variable alwaysStopAt="true" defaultValue="&quot;y&quot;" expression="" name="PARAM2" />
+        <variable alwaysStopAt="true" defaultValue="&quot;Any&quot;" expression="" name="PARAM2TYPE" />
+        <variable alwaysStopAt="true" defaultValue="&quot;Unit&quot;" expression="" name="RETURN" />
+        <context>
+            <option name="KOTLIN_STATEMENT" value="true"/>
+            <option name="KOTLIN_CLASS" value="true"/>
+            <option name="KOTLIN_NAMESPACE" value="true"/>
+        </context>
+    </template>
 </templateSet>
diff --git a/idea/src/org/jetbrains/jet/plugin/JetBundle.properties b/idea/src/org/jetbrains/jet/plugin/JetBundle.properties
index 49d2317cc95..d5eb738556f 100644
--- a/idea/src/org/jetbrains/jet/plugin/JetBundle.properties
+++ b/idea/src/org/jetbrains/jet/plugin/JetBundle.properties
@@ -29,5 +29,9 @@ implement.members=Implement members
 
 livetemplate.description.main=main() function
 livetemplate.description.soutp=Prints function parameter names and values to System.out
+livetemplate.description.void=Function returning nothing
+livetemplate.description.fun0=Function with no parameters
+livetemplate.description.fun1=Function with one parameter
+livetemplate.description.fun2=Function with two parameters
 macro.variable.of.type=kotlinVariableOfType(Type)
 macro.fun.parameters=functionParameters()
\ No newline at end of file