diff --git a/client/.classpath b/client/.classpath
index 7294cb02a6..ab2ffee3a8 100644
--- a/client/.classpath
+++ b/client/.classpath
@@ -9,7 +9,6 @@
 	<classpathentry kind="src" path="/looks"/>
 	<classpathentry kind="src" path="/extend"/>
 	<classpathentry kind="lib" path="/interfaces/Interfaces.jar" sourcepath="/interfaces/src"/>
-	<classpathentry kind="lib" path="/lib/jPDF.jar"/>
 	<classpathentry kind="lib" path="/tools/lib/jfreechart-1.0.2.jar"/>
 	<classpathentry kind="lib" path="/tools/lib/jcommon-1.0.5.jar"/>
 	<classpathentry kind="output" path="build"/>
diff --git a/client/build.xml b/client/build.xml
index c628b47c1b..f80eb7563c 100644
--- a/client/build.xml
+++ b/client/build.xml
@@ -27,7 +27,7 @@
     <pathelement path="../base/Base.jar"/>
     <pathelement path="../print/Print.jar"/>
     <pathelement path="../dbPort/dbPort.jar"/>
-    <pathelement path="../lib/freepdf.jar"/>
+    <pathelement path="../freepdf/freepdf.jar"/>
     <pathelement path="../lib/customization.jar"/>
     <pathelement path="../lib/patches.jar"/>
     <pathelement path="../lib/jcommon-1.0.5.jar"/>
diff --git a/client/src/org/compiere/apps/Attachment.java b/client/src/org/compiere/apps/Attachment.java
index 9357a66676..66a1d5dedc 100644
--- a/client/src/org/compiere/apps/Attachment.java
+++ b/client/src/org/compiere/apps/Attachment.java
@@ -28,8 +28,8 @@ import org.compiere.plaf.*;
 import org.compiere.swing.*;
 import org.compiere.util.*;
 
-import com.qoppa.pdf.*;
-import com.qoppa.pdfViewer.*;
+import org.adempiere.pdf.*;
+import org.adempiere.pdf.viewer.*;
 
 /**
  *  Attachment Viewer
diff --git a/client/src/org/compiere/apps/form/ArchiveViewer.java b/client/src/org/compiere/apps/form/ArchiveViewer.java
index 6a94a5b247..32a8cbb166 100644
--- a/client/src/org/compiere/apps/form/ArchiveViewer.java
+++ b/client/src/org/compiere/apps/form/ArchiveViewer.java
@@ -27,8 +27,8 @@ import org.compiere.grid.ed.*;
 import org.compiere.model.*;
 import org.compiere.swing.*;
 import org.compiere.util.*;
-import com.qoppa.pdf.*;
-import com.qoppa.pdfViewer.*;
+import org.adempiere.pdf.*;
+import org.adempiere.pdf.viewer.*;
 
 
 /**
diff --git a/client/src/org/compiere/print/Viewer.java b/client/src/org/compiere/print/Viewer.java
index 9f68ae7994..2b4db5fa04 100644
--- a/client/src/org/compiere/print/Viewer.java
+++ b/client/src/org/compiere/print/Viewer.java
@@ -31,7 +31,7 @@ import org.compiere.apps.search.*;
 import org.compiere.model.*;
 import org.compiere.swing.*;
 import org.compiere.util.*;
-import com.qoppa.pdf.*;
+import org.adempiere.pdf.*;
 
 /**
  *	Print View Frame