diff --git a/gantt-addon/pom.xml b/gantt-addon/pom.xml
index a846dbb..989be11 100644
--- a/gantt-addon/pom.xml
+++ b/gantt-addon/pom.xml
@@ -85,6 +85,7 @@
 			<plugin> 
 			   <groupId>org.apache.felix</groupId>
 			   <artifactId>maven-bundle-plugin</artifactId>
+			    <version>3.5.0</version>
 			   <extensions>true</extensions>
 			   <configuration>
 			       <instructions>
diff --git a/gantt-addon/src/main/resources/org/tltv/gantt/WidgetSet.gwt.xml b/gantt-addon/src/main/resources/org/tltv/gantt/WidgetSet.gwt.xml
index 943d851..0878221 100644
--- a/gantt-addon/src/main/resources/org/tltv/gantt/WidgetSet.gwt.xml
+++ b/gantt-addon/src/main/resources/org/tltv/gantt/WidgetSet.gwt.xml
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.5.1//EN" "http://www.gwtproject.org/doctype/2.5.1/gwt-module.dtd">
 <module>
 
 	<!-- Inherit DefaultWidgetSet -->
diff --git a/gantt-demo/src/main/resources/org/tltv/gantt/demo/DemoWidgetSet.gwt.xml b/gantt-demo/src/main/resources/org/tltv/gantt/demo/DemoWidgetSet.gwt.xml
index b7f72b1..99d5728 100644
--- a/gantt-demo/src/main/resources/org/tltv/gantt/demo/DemoWidgetSet.gwt.xml
+++ b/gantt-demo/src/main/resources/org/tltv/gantt/demo/DemoWidgetSet.gwt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.5.1//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.5.1/distro-source/core/src/gwt-module.dtd">
+<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.5.1//EN" "http://www.gwtproject.org/doctype/2.5.1/gwt-module.dtd">
 <module>
     <!--
         This file is automatically updated based on new dependencies by the