diff --git a/.project b/.project
new file mode 100644
index 0000000..55ce6e8
--- /dev/null
+++ b/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>jd-eclipse</name>
+	<comment>Project jd-eclipse created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>
diff --git a/README.md b/README.md
index 300e21f..0fad312 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-#JD-Eclipse
+# JD-Eclipse
 
 JD-Eclipse, a Java decompiler plug-in for the Eclipse platform.
 
@@ -8,18 +8,29 @@ JD-Eclipse, a Java decompiler plug-in for the Eclipse platform.
 - Java Decompiler Wikipedia page: [http://en.wikipedia.org/wiki/Java_Decompiler](http://en.wikipedia.org/wiki/Java_Decompiler)
 - JD-Eclipse source code: [https://github.com/java-decompiler/jd-eclipse](https://github.com/java-decompiler/jd-eclipse)
 
-##Description
-JD-Eclipse is a plug-in for the Eclipse platform. It allows you to 
-display all the Java sources during your debugging process, even if 
+## Description
+JD-Eclipse is a plug-in for the Eclipse platform. It allows you to
+display all the Java sources during your debugging process, even if
 you do not have them all.
 
-##How to build JD-Eclipse ?
-###With Gradle:
+## How to build JD-Eclipse ?
+### With Gradle:
 ```
 > ./gradlew installSiteDist
 ```
 generate _"build/install/jd-eclipse-site"_
-###With Eclipse:
+
+### With Maven:
+```
+> mvn clean package
+```
+creates _"jd.ide.eclipse.site/target/repository"_
+
+creates zipped version _"jd.ide.eclipse.site/target/jd.ide.eclipse.site-VERSION.zip"_
+
+#### Download current p2 Repository version for eclipse: [jd.ide.eclipse.site-1.0.0-SNAPSHOT.zip](jd.ide.eclipse.site/jd.ide.eclipse.site-1.0.0-SNAPSHOT.zip)
+
+### With Eclipse:
 - Download dependencies
 ```
 > ./gradlew downloadDependencies
@@ -29,7 +40,7 @@ generate _"build/install/jd-eclipse-site"_
 - Export _"Deployable features"_,
 - Copy _"site.xml"_ to the destination directory.
 
-##How to install JD-Eclipse ?
+## How to install JD-Eclipse ?
 1. Build or download & unzip _"jd-eclipse-site-x.y.z.zip"_,
 2. Launch _Eclipse_,
 3. Click on _"Help > Install New Software..."_,
@@ -38,15 +49,18 @@ generate _"build/install/jd-eclipse-site"_
 6. Check _"Java Decompiler Eclipse Plug-in"_,
 7. Next, next, next... and restart.
 
-##How to check the file associations ?
+## How to check the file associations ?
 Click on _"Window > Preferences > General > Editors > File Associations"_
 - _"*.class"_ : _Eclipse_ _"Class File Viewer"_ is selected by default.
 - _"*.class without source"_ : _"JD Class File Viewer"_ is selected by default.
 
-##How to configure JD-Eclipse ?
+## How to configure JD-Eclipse ?
 Click on _"Window > Preferences > Java > Decompiler"_
 
-##How to uninstall JD-Eclipse ?
+## How to uninstall JD-Eclipse ?
 1. Click on _"Help > About Eclipse > Installation Details"_,
 2. Select _"JD-Eclipse Plug-in"_,
 3. Click on _"Uninstall..."_.
+
+
+
diff --git a/jd.ide.eclipse.feature/.project b/jd.ide.eclipse.feature/.project
index 9ba520b..a93af25 100644
--- a/jd.ide.eclipse.feature/.project
+++ b/jd.ide.eclipse.feature/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.pde.FeatureBuilder</name>
 			<arguments>
@@ -13,5 +18,6 @@
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.FeatureNature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
 </projectDescription>
diff --git a/jd.ide.eclipse.feature/feature.xml b/jd.ide.eclipse.feature/feature.xml
index 86ce025..ba71c4e 100644
--- a/jd.ide.eclipse.feature/feature.xml
+++ b/jd.ide.eclipse.feature/feature.xml
@@ -2,19 +2,20 @@
 <feature
       id="jd.ide.eclipse.feature"
       label="JD-Eclipse Plug-in"
-      version="1.0.0"
+      version="1.0.0.qualifier"
       provider-name="Java Decompiler"
       plugin="jd.ide.eclipse.plugin">
 
    <description url="http://www.example.com/feature">
-    JD-Eclipse is a plug-in for the Eclipse platform. It allows you to display all the Java sources during your debugging process, even if you do not have them all.
+      JD-Eclipse is a plug-in for the Eclipse platform. It allows you to display all the Java sources during your debugging process, even if you do not have them all.
    </description>
 
    <copyright>
       Copyright (C) 2008-2015  Emmanuel Dupuy
    </copyright>
 
-   <license url="http://www.gnu.org/licenses/gpl-3.0.html">.
+   <license url="http://www.gnu.org/licenses/gpl-3.0.html">
+      .
                      GNU GENERAL PUBLIC LICENSE
 
                        Version 3, 29 June 2007
@@ -32,7 +33,7 @@ free software which everyone can redistribute and change under these terms.
   To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
+the &quot;copyright&quot; line and a pointer to where the full notice is found.
 
     JD-Eclipse is a plug-in for the Eclipse platform. It allows you to 
     display all the Java sources during your debugging process, even if you 
@@ -58,16 +59,16 @@ Also add information on how to contact you by electronic and paper mail.
 notice like this when it starts in an interactive mode:
 
     JD-Eclipse  Copyright (C) 2008-2015  Emmanuel Dupuy
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w&apos;.
     This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
+    under certain conditions; type `show c&apos; for details.
 
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
+The hypothetical commands `show w&apos; and `show c&apos; should show the appropriate
+parts of the General Public License.  Of course, your program&apos;s commands
+might be different; for a GUI interface, you would use an &quot;about box&quot;.
 
   You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
+if any, to sign a &quot;copyright disclaimer&quot; for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
 &lt;http://www.gnu.org/licenses/&gt;.
 
@@ -87,7 +88,7 @@ Public License instead of this License.  But first, please read
          id="jd.ide.eclipse.plugin"
          download-size="0"
          install-size="0"
-         version="1.0.0"
+         version="1.0.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/jd.ide.eclipse.feature/pom.xml b/jd.ide.eclipse.feature/pom.xml
new file mode 100644
index 0000000..6f3579a
--- /dev/null
+++ b/jd.ide.eclipse.feature/pom.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>jd.ide.eclipse</groupId>
+		<artifactId>jd.ide.eclipse.parent</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+
+	<packaging>eclipse-feature</packaging>
+	<artifactId>jd.ide.eclipse.feature</artifactId>
+
+</project>
diff --git a/jd.ide.eclipse.plugin/.project b/jd.ide.eclipse.plugin/.project
index 1a5dd7c..e1632aa 100644
--- a/jd.ide.eclipse.plugin/.project
+++ b/jd.ide.eclipse.plugin/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -24,5 +29,6 @@
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
 </projectDescription>
diff --git a/jd.ide.eclipse.plugin/META-INF/MANIFEST.MF b/jd.ide.eclipse.plugin/META-INF/MANIFEST.MF
index aaea229..6332c33 100644
--- a/jd.ide.eclipse.plugin/META-INF/MANIFEST.MF
+++ b/jd.ide.eclipse.plugin/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: JD-Eclipse Plug-in
 Bundle-SymbolicName: jd.ide.eclipse.plugin;singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.editors,
diff --git a/jd.ide.eclipse.plugin/pom.xml b/jd.ide.eclipse.plugin/pom.xml
new file mode 100644
index 0000000..f470af0
--- /dev/null
+++ b/jd.ide.eclipse.plugin/pom.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>jd.ide.eclipse</groupId>
+		<artifactId>jd.ide.eclipse.parent</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+
+	<packaging>eclipse-plugin</packaging>
+	<artifactId>jd.ide.eclipse.plugin</artifactId>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<version>2.8</version>
+				<executions>
+					<execution>
+						<id>copy-dependencies</id>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${basedir}/lib</outputDirectory>
+							<includeGroupIds>jd</includeGroupIds>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+	<dependencies>
+		<dependency>
+			<groupId>jd</groupId>
+			<artifactId>jd-core</artifactId>
+			<version>${jd-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>jd</groupId>
+			<artifactId>jd-common</artifactId>
+			<version>${jd-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>jd</groupId>
+			<artifactId>jd-common-ide</artifactId>
+			<version>${jd-version}</version>
+		</dependency>
+	</dependencies>
+	<repositories>
+		<repository>
+			<id>github-jd</id>
+			<url>https://github.com/java-decompiler/mvn-repo/raw/master/</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
+	</repositories>
+</project>
diff --git a/jd.ide.eclipse.site/site.xml b/jd.ide.eclipse.site/category.xml
similarity index 74%
rename from jd.ide.eclipse.site/site.xml
rename to jd.ide.eclipse.site/category.xml
index e9f2bcc..a53a8cb 100644
--- a/jd.ide.eclipse.site/site.xml
+++ b/jd.ide.eclipse.site/category.xml
@@ -3,7 +3,7 @@
    <description url="http://jd.benow.ca/jd-eclipse/update/">
       Eclipse Update Site for Java Decompiler Plug-in
    </description>
-   <feature url="features/jd.ide.eclipse.feature_1.0.0.jar" id="jd.ide.eclipse.feature" version="1.0.0">
+   <feature id="jd.ide.eclipse.feature" version="1.0.0.qualifier">
       <category name="JD-Eclipse"/>
    </feature>
    <category-def name="JD-Eclipse" label="Java Decompiler Eclipse Plug-in"/>
diff --git a/jd.ide.eclipse.site/jd.ide.eclipse.site-1.0.0-SNAPSHOT.zip b/jd.ide.eclipse.site/jd.ide.eclipse.site-1.0.0-SNAPSHOT.zip
new file mode 100644
index 0000000..82a0f18
Binary files /dev/null and b/jd.ide.eclipse.site/jd.ide.eclipse.site-1.0.0-SNAPSHOT.zip differ
diff --git a/jd.ide.eclipse.site/pom.xml b/jd.ide.eclipse.site/pom.xml
new file mode 100644
index 0000000..48a8906
--- /dev/null
+++ b/jd.ide.eclipse.site/pom.xml
@@ -0,0 +1,28 @@
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>jd.ide.eclipse.site</artifactId>
+	<packaging>eclipse-repository</packaging>
+
+	<parent>
+		<groupId>jd.ide.eclipse</groupId>
+		<artifactId>jd.ide.eclipse.parent</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-p2-repository-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<repositoryName>JD-Eclipse - Repository</repositoryName>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..bd02ee7
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>jd.ide.eclipse</groupId>
+	<artifactId>jd.ide.eclipse.parent</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
+	<properties>
+		<tycho-version>0.23.0</tycho-version>
+		<jd-version>0.7.1</jd-version>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+	<modules>
+		<module>jd.ide.eclipse.plugin</module>
+		<module>jd.ide.eclipse.feature</module>
+		<module>jd.ide.eclipse.site</module>
+	</modules>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-maven-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<extensions>true</extensions>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>target-platform-configuration</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<environments>
+						<environment>
+							<os>macosx</os>
+							<ws>cocoa</ws>
+							<arch>x86_64</arch>
+						</environment>
+						<environment>
+							<os>win32</os>
+							<ws>win32</ws>
+							<arch>x86_64</arch>
+						</environment>
+						<environment>
+							<os>linux</os>
+							<ws>gtk</ws>
+							<arch>x86_64</arch>
+						</environment>
+						<environment>
+							<os>linux</os>
+							<ws>gtk</ws>
+							<arch>x86</arch>
+						</environment>
+					</environments>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	<repositories>
+		<repository>
+			<id>eclipse-indigo</id>
+			<layout>p2</layout>
+			<url>http://download.eclipse.org/eclipse/updates/3.8/R-3.8.2-201301310800</url>
+		</repository>
+	</repositories>
+</project>
\ No newline at end of file