diff --git a/thrift/src/main/java/com/intellij/plugins/thrift/ThriftFileTypeLoader.java b/thrift/src/main/java/com/intellij/plugins/thrift/ThriftFileTypeLoader.java
new file mode 100644
index 00000000..6a766acb
--- /dev/null
+++ b/thrift/src/main/java/com/intellij/plugins/thrift/ThriftFileTypeLoader.java
@@ -0,0 +1,15 @@
+package com.intellij.plugins.thrift;
+
+import com.intellij.openapi.fileTypes.FileTypeConsumer;
+import com.intellij.openapi.fileTypes.FileTypeFactory;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Created by fkorotkov.
+ */
+public class ThriftFileTypeLoader extends FileTypeFactory {
+  @Override
+  public void createFileTypes(@NotNull FileTypeConsumer fileTypeConsumer) {
+    fileTypeConsumer.consume(ThriftFileType.INSTANCE);
+  }
+}
diff --git a/thrift/src/main/resources/META-INF/plugin.xml b/thrift/src/main/resources/META-INF/plugin.xml
index 4c0d9126..48f43b88 100644
--- a/thrift/src/main/resources/META-INF/plugin.xml
+++ b/thrift/src/main/resources/META-INF/plugin.xml
@@ -122,7 +122,7 @@
     <!-- Add your application components here -->
   </application-components>
   <extensions defaultExtensionNs="com.intellij">
-    <fileType name="Thrift" extensions="thrift" language="thrift" implementationClass="com.intellij.plugins.thrift.ThriftFileType"/>
+    <fileTypeFactory implementation="com.intellij.plugins.thrift.ThriftFileTypeLoader"/>
     <lang.parserDefinition language="thrift" implementationClass="com.intellij.plugins.thrift.lang.parser.ThriftParserDefinition"/>
     <completion.contributor language="any" implementationClass="com.intellij.plugins.thrift.completion.ThriftKeywordCompletionContributor"/>
     <itemPresentationProvider forClass="com.intellij.plugins.thrift.lang.psi.ThriftTopLevelDeclaration"