diff --git a/build.xml b/build.xml
index b2b3540ecd6..a58cb22b777 100644
--- a/build.xml
+++ b/build.xml
@@ -515,7 +515,9 @@
     <target name="runtime">
         <cleandir dir="${output}/classes/runtime"/>
         <javac2 destdir="${output}/classes/runtime" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false" source="${java.target}" target="${java.target}">
+            <withKotlin/>
             <src path="${basedir}/runtime/src"/>
+            <src path="${basedir}/runtime/kt"/>
         </javac2>
 
         <cleandir dir="${output}/classes/stdlib"/>
diff --git a/libraries/tools/runtime/pom.xml b/libraries/tools/runtime/pom.xml
index ab580b622ce..841085c936f 100644
--- a/libraries/tools/runtime/pom.xml
+++ b/libraries/tools/runtime/pom.xml
@@ -33,6 +33,7 @@
                                 <delete dir="${basedir}/target/copied-sources" failonerror="false" />
                                 <copy todir="${basedir}/target/copied-sources">
                                     <fileset dir="${basedir}/../../../runtime/src"/>
+                                    <fileset dir="${basedir}/../../../runtime/kt"/>
                                 </copy>
                             </target>
                         </configuration>
@@ -75,6 +76,21 @@
                 </executions>
             </plugin>
 
+            <plugin>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-maven-plugin</artifactId>
+                <version>${project.version}</version>
+
+                <executions>
+                    <execution>
+                        <id>compile</id>
+                        <phase>process-sources</phase>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/runtime/kt/PropertyMetadata.kt b/runtime/kt/PropertyMetadata.kt
new file mode 100644
index 00000000000..80a07680d49
--- /dev/null
+++ b/runtime/kt/PropertyMetadata.kt
@@ -0,0 +1,7 @@
+package jet
+
+public trait PropertyMetadata {
+    public val name: String
+}
+
+public class PropertyMetadataImpl(public override val name: String): PropertyMetadata
diff --git a/runtime/runtime.iml b/runtime/runtime.iml
index d5c07432750..94b400ce62f 100644
--- a/runtime/runtime.iml
+++ b/runtime/runtime.iml
@@ -4,6 +4,7 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/kt" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/runtime/src/jet/PropertyMetadata.java b/runtime/src/jet/PropertyMetadata.java
deleted file mode 100644
index 2ea69106c09..00000000000
--- a/runtime/src/jet/PropertyMetadata.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2010-2013 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package jet;
-
-import org.jetbrains.jet.rt.annotation.AssertInvisibleInResolver;
-
-@AssertInvisibleInResolver
-public interface PropertyMetadata {
-
-    public String getName();
-}
diff --git a/runtime/src/jet/PropertyMetadataImpl.java b/runtime/src/jet/PropertyMetadataImpl.java
deleted file mode 100644
index 245f5131f87..00000000000
--- a/runtime/src/jet/PropertyMetadataImpl.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2010-2013 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package jet;
-
-import org.jetbrains.jet.rt.annotation.AssertInvisibleInResolver;
-
-@AssertInvisibleInResolver
-public class PropertyMetadataImpl implements PropertyMetadata {
-    private final String name;
-
-    public PropertyMetadataImpl(String name) {
-        this.name = name;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-}