diff --git a/.classpath b/.classpath
index 9d156a4b4c..1b2ef01032 100644
--- a/.classpath
+++ b/.classpath
@@ -98,16 +98,14 @@
 	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zhtml.jar" sourcepath="zkwebui/WEB-INF/lib/zhtml-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zhtml-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zkex.jar" sourcepath="zkwebui/WEB-INF/lib/zkex-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zkmax.jar"/>
+	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zkmax.jar" sourcepath="zkwebui/WEB-INF/lib/zkmax-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zkmax-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zkplus.jar"/>
+	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zkplus.jar" sourcepath="zkwebui/WEB-INF/lib/zkplus-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zml.jar"/>
 	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/bsh.jar"/>
 	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/commons-fileupload.jar"/>
 	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/groovy.jar"/>
 	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/jython.jar"/>
-	<classpathentry kind="lib" path="zkwebui/WEB-INF/lib/jcommon.jar"/>
-	<classpathentry kind="lib" path="zkwebui/WEB-INF/lib/jfreechart.jar"/>
 	<classpathentry kind="lib" path="zkwebui/WEB-INF/lib/timelinez-sources.jar"/>
 	<classpathentry kind="lib" path="zkwebui/WEB-INF/lib/zcommon-sources.jar"/>
 	<classpathentry kind="lib" path="zkwebui/WEB-INF/lib/zkex-sources.jar"/>
@@ -134,8 +132,6 @@
 	<classpathentry kind="lib" path="zkwebui/WEB-INF/lib/zkplus-sources.jar"/>
 	<classpathentry kind="lib" path="posterita/posterita/web/WEB-INF/lib/displaytag-export-poi-1.1.1.jar"/>
 	<classpathentry kind="lib" path="posterita/posterita/web/WEB-INF/lib/itext-1.3.jar"/>
-	<classpathentry kind="lib" path="posterita/posterita/web/WEB-INF/lib/jcommon-1.0.10.jar"/>
-	<classpathentry kind="lib" path="posterita/posterita/web/WEB-INF/lib/jfreechart-1.0.2.jar"/>
 	<classpathentry kind="lib" path="posterita/posterita/web/WEB-INF/lib/log4j-1.2.13.jar"/>
 	<classpathentry kind="lib" path="posterita/posterita/web/WEB-INF/lib/poi-3.0-FINAL.jar"/>
 	<classpathentry kind="lib" path="posterita/posterita/web/WEB-INF/lib/servlet.jar"/>
diff --git a/migration/353a-trunk/oracle/499_FR2819356.sql b/migration/353a-trunk/oracle/499_FR2819356.sql
new file mode 100644
index 0000000000..3273103e7b
--- /dev/null
+++ b/migration/353a-trunk/oracle/499_FR2819356.sql
@@ -0,0 +1,20 @@
+-- Jul 13, 2009 2:22:40 PM MYT
+-- Add more chart type support to Performance indicator - ID: 2819356
+UPDATE AD_Column SET IsMandatory='Y',Updated=TO_DATE('2009-07-13 14:22:40','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=57921
+;
+
+-- Jul 13, 2009 2:23:07 PM MYT
+-- Add more chart type support to Performance indicator - ID: 2819356
+ALTER TABLE PA_Goal MODIFY ChartType NVARCHAR2(2) DEFAULT 'BC'
+;
+
+-- Jul 13, 2009 2:23:10 PM MYT
+-- Add more chart type support to Performance indicator - ID: 2819356
+UPDATE PA_Goal SET ChartType='BC' WHERE ChartType IS NULL
+;
+
+-- Jul 13, 2009 2:23:10 PM MYT
+-- Add more chart type support to Performance indicator - ID: 2819356
+ALTER TABLE PA_Goal MODIFY ChartType NOT NULL
+;
+
diff --git a/migration/353a-trunk/postgresql/499_FR2819356.sql b/migration/353a-trunk/postgresql/499_FR2819356.sql
new file mode 100644
index 0000000000..a2af8ca9a4
--- /dev/null
+++ b/migration/353a-trunk/postgresql/499_FR2819356.sql
@@ -0,0 +1,20 @@
+-- Jul 13, 2009 2:22:40 PM MYT
+-- Add more chart type support to Performance indicator - ID: 2819356
+UPDATE AD_Column SET IsMandatory='Y',Updated=TO_TIMESTAMP('2009-07-13 14:22:40','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=57921
+;
+
+-- Jul 13, 2009 2:23:07 PM MYT
+-- Add more chart type support to Performance indicator - ID: 2819356
+insert into t_alter_column values('pa_goal','ChartType','VARCHAR(2)',null,'BC')
+;
+
+-- Jul 13, 2009 2:23:10 PM MYT
+-- Add more chart type support to Performance indicator - ID: 2819356
+UPDATE PA_Goal SET ChartType='BC' WHERE ChartType IS NULL
+;
+
+-- Jul 13, 2009 2:23:10 PM MYT
+-- Add more chart type support to Performance indicator - ID: 2819356
+insert into t_alter_column values('pa_goal','ChartType',null,'NOT NULL',null)
+;
+
diff --git a/tools/build.xml b/tools/build.xml
index a5d6a68ec1..caa29baa29 100644
--- a/tools/build.xml
+++ b/tools/build.xml
@@ -260,6 +260,13 @@
 			<zipfileset src="lib/itext-1.4.8.jar">
 				<patternset refid="manifest.exclude" />
 			</zipfileset>
+			<!-- JFreeChart			-->
+			<zipfileset src="lib/jfreechart-1.0.11.jar">
+				<patternset refid="manifest.exclude" />
+			</zipfileset>
+			<zipfileset src="lib/jcommon-1.0.14.jar">
+				<patternset refid="manifest.exclude" />
+			</zipfileset>
 			<!-- JMS -->
 			<zipfileset src="lib/activemq-core-5.0.0.jar">
 				<patternset refid="manifest.exclude" />