diff --git a/trunk/.classpath b/trunk/.classpath
index 12341677..fc51864a 100644
--- a/trunk/.classpath
+++ b/trunk/.classpath
@@ -17,5 +17,10 @@
 	<classpathentry kind="lib" path="SIPRPSoft/lib/postgresql-8.0-317.jdbc3.jar"/>
 	<classpathentry kind="lib" path="SIPRPSoft/lib/jcalendar-1.3.2.jar"/>
 	<classpathentry kind="lib" path="web/lib/velocity-dep-1.4.jar"/>
+	<classpathentry kind="lib" path="SIPRPSoft/lib/jai_imageio.jar"/>
+	<classpathentry kind="lib" path="SIPRPSoft/lib/nlog4j-1.2.25.jar"/>
+	<classpathentry kind="lib" path="SIPRPSoft/lib/avalon-framework-4.2.0.jar"/>
+	<classpathentry kind="lib" path="SIPRPSoft/lib/batik.jar"/>
+	<classpathentry kind="lib" path="SIPRPSoft/lib/fop.jar"/>
 	<classpathentry kind="output" path="build"/>
 </classpath>
diff --git a/trunk/SIPRPSoft/lib/avalon-framework-4.2.0.jar b/trunk/SIPRPSoft/lib/avalon-framework-4.2.0.jar
new file mode 100644
index 00000000..b1aa6d7c
Binary files /dev/null and b/trunk/SIPRPSoft/lib/avalon-framework-4.2.0.jar differ
diff --git a/trunk/SIPRPSoft/lib/batik.jar b/trunk/SIPRPSoft/lib/batik.jar
new file mode 100644
index 00000000..28c8bac0
Binary files /dev/null and b/trunk/SIPRPSoft/lib/batik.jar differ
diff --git a/trunk/SIPRPSoft/lib/fop.jar b/trunk/SIPRPSoft/lib/fop.jar
new file mode 100644
index 00000000..f7a3a2c7
Binary files /dev/null and b/trunk/SIPRPSoft/lib/fop.jar differ
diff --git a/trunk/lib.tools/jai_imageio.jar b/trunk/SIPRPSoft/lib/jai_imageio.jar
similarity index 100%
rename from trunk/lib.tools/jai_imageio.jar
rename to trunk/SIPRPSoft/lib/jai_imageio.jar
diff --git a/trunk/SIPRPSoft/lib/nlog4j-1.2.25.jar b/trunk/SIPRPSoft/lib/nlog4j-1.2.25.jar
new file mode 100644
index 00000000..e398699b
Binary files /dev/null and b/trunk/SIPRPSoft/lib/nlog4j-1.2.25.jar differ
diff --git a/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java b/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java
index 497bb5d6..c26fe06a 100644
--- a/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java
+++ b/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java
@@ -98,26 +98,26 @@ public class SIPRPDataLoader implements CompanyDataLoader
 //		Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local_3" );
 //		Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" );
 		
-		Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" );
-		Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" );
-		Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" );
-		Singleton.setInstance( SingletonConstants.LOCAL_URL, "10.158.2.3:5432" );
-		Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local" );
-		Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" );
-//		
 //		Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" );
 //		Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" );
 //		Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" );
-//		Singleton.setInstance( SingletonConstants.LOCAL_URL, "localhost:5432" );
+//		Singleton.setInstance( SingletonConstants.LOCAL_URL, "10.158.2.3:5432" );
 //		Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local" );
 //		Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" );
-		
+//		
 //		Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" );
 //		Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" );
 //		Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" );
-//		Singleton.setInstance( SingletonConstants.LOCAL_URL, "192.168.1.1:5432" );
+//		Singleton.setInstance( SingletonConstants.LOCAL_URL, "localhost:5432" );
 //		Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local" );
 //		Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" );
+		
+		Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" );
+		Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" );
+		Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" );
+		Singleton.setInstance( SingletonConstants.LOCAL_URL, "192.168.1.1:5432" );
+		Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local" );
+		Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" );
 	}
 	
 }
diff --git a/trunk/build.xml b/trunk/build.xml
index da0bd69f..6b9f378f 100644
--- a/trunk/build.xml
+++ b/trunk/build.xml
@@ -15,6 +15,7 @@
 	<property name="app.src.dir" value="${app.dir}/src" />
 	<property name="app.lib.dir" value="${app.dir}/lib" />
 	<property name="app.images.dir" value="${app.dir}/images" />
+	<property name="siprp.main" value="siprp.Main" />
 	<property name="app.conf.dir" value="${app.dir}/conf" />
 	<property name="app.dist.dir" value="${app.dir}/dist" />
 	<property name="app.dist.lib.dir" value="${app.dist.dir}/lib" />
@@ -170,9 +171,13 @@
 		</pathconvert>
 		<mkdir dir="${app.dist.dir}" />
 		<jar destfile="${app.dist.dir}/${app.jar.name}">
-			<fileset dir="${app.build.dir}">
+			<fileset dir="${app.build.classes.dir}">
 				<include name="**/*" />
 			</fileset>
+			<manifest>
+				<attribute name="Main-Class" value="${siprp.main}" />
+				<attribute name="Class-Path" value="${jar.classpath.converted}" />
+			</manifest>
 		</jar>
 		<copy todir="${app.dist.lib.dir}">
 			<fileset dir="${app.lib.dir}">