diff --git a/eclox.feature/feature.xml b/eclox.feature/feature.xml
index 9a9e7adb..319a747d 100644
--- a/eclox.feature/feature.xml
+++ b/eclox.feature/feature.xml
@@ -7,14 +7,15 @@
       plugin="org.gna.eclox"
       exclusive="true">
 
-   <description url="http://home.gna.org/eclox">
+   <description url="http://anb0s.github.io/eclox">
       Eclox provides the Doxygen documentation system for Eclipse.
-
-This feature provides a documentation builder and a graphical editor for doxygen.
+This feature provides a documentation builder and a graphical
+editor for doxygen.
    </description>
 
-   <copyright url="http://home.gna.org/eclox">
+   <copyright url="http://anb0s.github.io/eclox">
       Copyright (C) 2003-2013 Guillaume Brocker
+Copyright (C) 2015-2016 Andre Bossert
    </copyright>
 
    <license url="http://www.eclipse.org/legal/epl-v10.html">
@@ -22,9 +23,9 @@ This feature provides a documentation builder and a graphical editor for doxygen
    </license>
 
    <url>
-      <update label="Eclox Update Site" url="http://download.gna.org/eclox/update"/>
-      <discovery label="Eclox Update Site" url="http://download.gna.org/eclox/update"/>
-      <discovery label="Eclox Homepage" url="http://home.gna.org/eclox"/>
+      <update label="Eclox Update Site" url="http://anb0s.github.io/eclox"/>
+      <discovery label="Eclox Update Site" url="http://anb0s.github.io/eclox"/>
+      <discovery label="Eclox Homepage" url="http://anb0s.github.io/eclox"/>
    </url>
 
    <requires>
diff --git a/eclox.update-site/artifacts.jar b/eclox.update-site/artifacts.jar
deleted file mode 100644
index f5436d3b..00000000
Binary files a/eclox.update-site/artifacts.jar and /dev/null differ
diff --git a/eclox.update-site/content.jar b/eclox.update-site/content.jar
deleted file mode 100644
index a4bd875b..00000000
Binary files a/eclox.update-site/content.jar and /dev/null differ
diff --git a/eclox.update-site/features/org.gna.eclox_0.10.2.201606081049.jar b/eclox.update-site/features/org.gna.eclox_0.10.2.201606081049.jar
new file mode 100644
index 00000000..c146e36b
Binary files /dev/null and b/eclox.update-site/features/org.gna.eclox_0.10.2.201606081049.jar differ
diff --git a/eclox.update-site/features/org.gna.eclox_0.8.0.jar b/eclox.update-site/features/org.gna.eclox_0.8.0.jar
new file mode 100644
index 00000000..2628c97f
Binary files /dev/null and b/eclox.update-site/features/org.gna.eclox_0.8.0.jar differ
diff --git a/eclox.update-site/plugins/org.gna.eclox.core_0.10.2.201606081049.jar b/eclox.update-site/plugins/org.gna.eclox.core_0.10.2.201606081049.jar
new file mode 100644
index 00000000..d9cac3f3
Binary files /dev/null and b/eclox.update-site/plugins/org.gna.eclox.core_0.10.2.201606081049.jar differ
diff --git a/eclox.update-site/plugins/org.gna.eclox.core_0.8.0.jar b/eclox.update-site/plugins/org.gna.eclox.core_0.8.0.jar
new file mode 100644
index 00000000..65ceba39
Binary files /dev/null and b/eclox.update-site/plugins/org.gna.eclox.core_0.8.0.jar differ
diff --git a/eclox.update-site/plugins/org.gna.eclox.help_0.10.2.201606081049.jar b/eclox.update-site/plugins/org.gna.eclox.help_0.10.2.201606081049.jar
new file mode 100644
index 00000000..dfffe9f8
Binary files /dev/null and b/eclox.update-site/plugins/org.gna.eclox.help_0.10.2.201606081049.jar differ
diff --git a/eclox.update-site/plugins/org.gna.eclox.help_0.8.0.jar b/eclox.update-site/plugins/org.gna.eclox.help_0.8.0.jar
new file mode 100644
index 00000000..b97f6531
Binary files /dev/null and b/eclox.update-site/plugins/org.gna.eclox.help_0.8.0.jar differ
diff --git a/eclox.update-site/plugins/org.gna.eclox.ui_0.10.2.201606081049.jar b/eclox.update-site/plugins/org.gna.eclox.ui_0.10.2.201606081049.jar
new file mode 100644
index 00000000..806992f7
Binary files /dev/null and b/eclox.update-site/plugins/org.gna.eclox.ui_0.10.2.201606081049.jar differ
diff --git a/eclox.update-site/plugins/org.gna.eclox.ui_0.8.0.jar b/eclox.update-site/plugins/org.gna.eclox.ui_0.8.0.jar
new file mode 100644
index 00000000..39780597
Binary files /dev/null and b/eclox.update-site/plugins/org.gna.eclox.ui_0.8.0.jar differ
diff --git a/eclox.update-site/plugins/org.gna.eclox_0.10.2.201606081049.jar b/eclox.update-site/plugins/org.gna.eclox_0.10.2.201606081049.jar
new file mode 100644
index 00000000..18d8da3c
Binary files /dev/null and b/eclox.update-site/plugins/org.gna.eclox_0.10.2.201606081049.jar differ
diff --git a/eclox.update-site/plugins/org.gna.eclox_0.8.0.jar b/eclox.update-site/plugins/org.gna.eclox_0.8.0.jar
new file mode 100644
index 00000000..e14b4b7a
Binary files /dev/null and b/eclox.update-site/plugins/org.gna.eclox_0.8.0.jar differ
diff --git a/eclox.update-site/publish_with_site_xml.cmd b/eclox.update-site/publish_with_site_xml.cmd
new file mode 100644
index 00000000..2c3df4e3
--- /dev/null
+++ b/eclox.update-site/publish_with_site_xml.cmd
@@ -0,0 +1,5 @@
+set ECLIPSE_EQUINOX_LAUNCHER_JAR=c:\Progs\eclipse-SDK-4.6-win32-x86_64\plugins\org.eclipse.equinox.launcher_1.3.200.v20160318-1642.jar
+PUSHD %~dp0
+set REPOSITORY_OUT=%CD%\repository
+POPD
+java -jar %ECLIPSE_EQUINOX_LAUNCHER_JAR% -application org.eclipse.equinox.p2.publisher.UpdateSitePublisher -metadataRepository file:/%REPOSITORY_OUT% -artifactRepository file:/%REPOSITORY_OUT% -source . -compress -publishArtifacts
diff --git a/eclox.update-site/publish_without_site_xml.cmd b/eclox.update-site/publish_without_site_xml.cmd
new file mode 100644
index 00000000..e5050f85
--- /dev/null
+++ b/eclox.update-site/publish_without_site_xml.cmd
@@ -0,0 +1,5 @@
+set ECLIPSE_EQUINOX_LAUNCHER_JAR=c:\Progs\eclipse-SDK-4.6-win32-x86_64\plugins\org.eclipse.equinox.launcher_1.3.200.v20160318-1642.jar
+PUSHD %~dp0
+set REPOSITORY_OUT=%CD%\repository
+POPD
+java -jar %ECLIPSE_EQUINOX_LAUNCHER_JAR% -application org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher -metadataRepository file:/%REPOSITORY_OUT% -artifactRepository file:/%REPOSITORY_OUT% -source . -compress -publishArtifacts
diff --git a/eclox.update-site/site.xml b/eclox.update-site/site.xml
index b4d69729..edff36cf 100644
--- a/eclox.update-site/site.xml
+++ b/eclox.update-site/site.xml
@@ -3,12 +3,23 @@
    <description name="Eclox Update Site" url="http://download.gna.org/eclox/update">
       This is the official eclox&apos;s update site.
    </description>
+   <feature url="features/org.gna.eclox_0.10.2.201606081049.jar" id="org.gna.eclox" version="0.10.2.201606081049">
+      <category name="eclox_0_10"/>
+   </feature>
    <feature url="features/org.gna.eclox_0.10.1.jar" id="org.gna.eclox" version="0.10.1">
-      <category name="eclox_010"/>
+      <category name="eclox_0_10"/>
+   </feature>
+   <feature url="features/org.gna.eclox_0.8.0.jar" id="org.gna.eclox" version="0.8.0">
+      <category name="eclox_0_8"/>
    </feature>
-   <category-def name="eclox_010" label="eclox 0.10">
+   <category-def name="eclox_0_10" label="eclox 0.10">
+      <description>
+         Eclox EPL Releases
+      </description>
+   </category-def>
+   <category-def name="eclox_0_8" label="eclox 0.8">
       <description>
-         Eclox EPL release
+         Eclox GPL Releases
       </description>
    </category-def>
 </site>
diff --git a/eclox/META-INF/MANIFEST.MF b/eclox/META-INF/MANIFEST.MF
index 6f5ef0f9..26f30e2b 100644
--- a/eclox/META-INF/MANIFEST.MF
+++ b/eclox/META-INF/MANIFEST.MF
@@ -3,5 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Eclox Branding Information
 Bundle-SymbolicName: org.gna.eclox; singleton:=true
 Bundle-Version: 0.10.2.qualifier
-Bundle-Vendor: Guillaume Brocker
+Bundle-Vendor: Guillaume Brocker, Andre Bossert
 Bundle-Localization: 
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6