diff --git a/.gitignore b/.gitignore
index 6f3894d06..c14aad97b 100755
--- a/.gitignore
+++ b/.gitignore
@@ -55,9 +55,10 @@ build/Xcode/FlatBuffers.xcodeproj/xcuserdata/**
 FlatBuffers.xcodeproj/
 java/.idea
 java/*.iml
-java/target
-**/*.pyc
 .idea
+*.iml
+target
+**/*.pyc
 build/VS2010/FlatBuffers.sdf
 build/VS2010/FlatBuffers.opensdf
 build/VS2010/ipch/**/*.ipch
diff --git a/java/pom.xml b/pom.xml
similarity index 89%
rename from java/pom.xml
rename to pom.xml
index dd92b9d55..8e32feec3 100644
--- a/java/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   <groupId>com.google.flatbuffers</groupId>
   <artifactId>flatbuffers-java</artifactId>
   <version>1.3.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
+  <packaging>bundle</packaging>
   <name>FlatBuffers Java API</name>
   <description>
     Memory Efficient Serialization Library
@@ -33,7 +33,7 @@
   <dependencies>
   </dependencies>
   <build>
-    <sourceDirectory>./</sourceDirectory>
+    <sourceDirectory>java</sourceDirectory>
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
@@ -78,6 +78,12 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>3.0.1</version>
+        <extensions>true</extensions>
+      </plugin>
     </plugins>
   </build>
 </project>