diff --git a/build.xml b/build.xml
index 81531905a99..3aa42cc5126 100644
--- a/build.xml
+++ b/build.xml
@@ -648,9 +648,10 @@
             </classpath>
         </javac2>
 
-        <jar manifest="${basedir}/plugins/android-compiler-plugin/src/META-INF/MANIFEST.MF" destfile="${kotlin-home}/lib/android-compiler-plugin.jar">
+        <jar destfile="${kotlin-home}/lib/android-compiler-plugin.jar">
             <fileset dir="${output}/classes/android-compiler-plugin"/>
             <zipfileset file="${kotlin-home}/build.txt" prefix="META-INF"/>
+            <fileset dir="${basedir}/plugins/android-compiler-plugin/src" includes="META-INF/services/**"/>
         </jar>
     </target>
 
diff --git a/plugins/android-compiler-plugin/src/META-INF/MANIFEST.MF b/plugins/android-compiler-plugin/src/META-INF/MANIFEST.MF
deleted file mode 100644
index 2352d7dc9a3..00000000000
--- a/plugins/android-compiler-plugin/src/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,6 +0,0 @@
-Manifest-Version: 1.0
-Implementation-Vendor: JetBrains
-
-Name: org.jetbrains.kotlin.compiler.plugin
-CommandLineProcessor: org.jetbrains.kotlin.android.AndroidCommandLineProcessor
-ComponentRegistrar: org.jetbrains.kotlin.android.AndroidComponentRegistrar
diff --git a/plugins/android-compiler-plugin/src/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor b/plugins/android-compiler-plugin/src/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor
new file mode 100644
index 00000000000..c4157769bcd
--- /dev/null
+++ b/plugins/android-compiler-plugin/src/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor
@@ -0,0 +1 @@
+org.jetbrains.kotlin.android.AndroidCommandLineProcessor
\ No newline at end of file
diff --git a/plugins/android-compiler-plugin/src/META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar b/plugins/android-compiler-plugin/src/META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
new file mode 100644
index 00000000000..51108826467
--- /dev/null
+++ b/plugins/android-compiler-plugin/src/META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
@@ -0,0 +1 @@
+org.jetbrains.kotlin.android.AndroidComponentRegistrar
\ No newline at end of file