diff --git a/ganttzk/src/main/resources/metainfo/zk/lang-addon.xml b/ganttzk/src/main/resources/metainfo/zk/lang-addon.xml
index 1389cb2ce..9a4ff3fd4 100755
--- a/ganttzk/src/main/resources/metainfo/zk/lang-addon.xml
+++ b/ganttzk/src/main/resources/metainfo/zk/lang-addon.xml
@@ -113,9 +113,11 @@
     <component>
         <component-name>milestone</component-name>
         <component-class>org.zkoss.ganttz.MilestoneComponent</component-class>
+        <widget-class>ganttz.Milestone</widget-class>
         <mold>
             <mold-name>default</mold-name>
-            <mold-uri>~./ganttz/milestone.dsp</mold-uri>
+            <!-- <mold-uri>~./ganttz/milestone.dsp</mold-uri> -->
+            <mold-uri>mold/milestone.js</mold-uri>
         </mold>
     </component>
 
diff --git a/ganttzk/src/main/resources/web/js/ganttz/Milestone.js b/ganttzk/src/main/resources/web/js/ganttz/Milestone.js
new file mode 100644
index 000000000..f8e724e34
--- /dev/null
+++ b/ganttzk/src/main/resources/web/js/ganttz/Milestone.js
@@ -0,0 +1,2 @@
+zk.$package("ganttz");
+ganttz.Milestone = zk.$extends(ganttz.TaskComponent, {},{});
\ No newline at end of file
diff --git a/ganttzk/src/main/resources/web/js/ganttz/mold/milestone.js b/ganttzk/src/main/resources/web/js/ganttz/mold/milestone.js
new file mode 100644
index 000000000..985b475a8
--- /dev/null
+++ b/ganttzk/src/main/resources/web/js/ganttz/mold/milestone.js
@@ -0,0 +1,12 @@
+function(out){
+		out.push('<div ', this.domAttrs_(),
+				'z.type="ganttz.task.Task"',
+				'idTask="', this.id,'"',
+				'z.autoz="true"',
+				'class="milestone"',
+				'>');
+			out.push('<div class="completion"></div>');
+			out.push('<div class="completion2"></div>');
+			out.push('<div class="milestone_end"></div>');
+		out.push('</div>');
+}
\ No newline at end of file
diff --git a/ganttzk/src/main/resources/web/js/ganttz/zk.wpd b/ganttzk/src/main/resources/web/js/ganttz/zk.wpd
index 23bb92572..6bcfbfb4b 100644
--- a/ganttzk/src/main/resources/web/js/ganttz/zk.wpd
+++ b/ganttzk/src/main/resources/web/js/ganttz/zk.wpd
@@ -17,4 +17,5 @@
     <widget name="Planner"/>
     <widget name="DependencyComponent"/>
     <widget name="TimeTracker" />
+    <widget name="Milestone" />
 </package>