diff --git a/pom.xml b/pom.xml
index c868e5a15bd..8dc3caba1d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
             <version>1.2.17</version>
-            <scope>compile</scope>
+            <scope>runtime</scope>
             <optional>true</optional>
         </dependency>
 
diff --git a/src/main/assemblies/plugin.xml b/src/main/assemblies/plugin.xml
new file mode 100644
index 00000000000..2ccfc875e9c
--- /dev/null
+++ b/src/main/assemblies/plugin.xml
@@ -0,0 +1,17 @@
+<assembly>
+    <id>plugin</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>/</outputDirectory>
+            <useProjectArtifact>true</useProjectArtifact>
+            <useTransitiveFiltering>true</useTransitiveFiltering>
+            <excludes>
+                <exclude>org.elasticsearch:elasticsearch</exclude>
+            </excludes>
+        </dependencySet>
+    </dependencySets>
+</assembly>
\ No newline at end of file