diff --git a/ChangeLog b/ChangeLog
index 6050b8d0e..c13a9fe00 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,8 @@ $Source$
       - fixed an error when $cfg['Server']['table_info'] is not valid;
       - optimized a bit;
       - removed an "onchange" js handler to lower server charge.
+    * pdf_schema.php3; fpdf/*; libraries/fpdf/*: moved the "fpdf" directory in
+      the "libraries" one.
 
 2002-05-25 Alexander M. Turek  <rabus@users.sourceforge.net>
     * lang/italian.inc.php3: Updates, thanks again to
diff --git a/fpdf/README b/libraries/fpdf/README
similarity index 100%
rename from fpdf/README
rename to libraries/fpdf/README
diff --git a/fpdf/font/courier.php3 b/libraries/fpdf/font/courier.php3
old mode 100755
new mode 100644
similarity index 100%
rename from fpdf/font/courier.php3
rename to libraries/fpdf/font/courier.php3
diff --git a/fpdf/font/helvetica.php3 b/libraries/fpdf/font/helvetica.php3
old mode 100755
new mode 100644
similarity index 100%
rename from fpdf/font/helvetica.php3
rename to libraries/fpdf/font/helvetica.php3
diff --git a/fpdf/font/helveticab.php3 b/libraries/fpdf/font/helveticab.php3
old mode 100755
new mode 100644
similarity index 100%
rename from fpdf/font/helveticab.php3
rename to libraries/fpdf/font/helveticab.php3
diff --git a/fpdf/font/helveticabi.php3 b/libraries/fpdf/font/helveticabi.php3
old mode 100755
new mode 100644
similarity index 100%
rename from fpdf/font/helveticabi.php3
rename to libraries/fpdf/font/helveticabi.php3
diff --git a/fpdf/font/helveticai.php3 b/libraries/fpdf/font/helveticai.php3
old mode 100755
new mode 100644
similarity index 100%
rename from fpdf/font/helveticai.php3
rename to libraries/fpdf/font/helveticai.php3
diff --git a/fpdf/font/symbol.php3 b/libraries/fpdf/font/symbol.php3
old mode 100755
new mode 100644
similarity index 100%
rename from fpdf/font/symbol.php3
rename to libraries/fpdf/font/symbol.php3
diff --git a/fpdf/font/times.php3 b/libraries/fpdf/font/times.php3
old mode 100755
new mode 100644
similarity index 100%
rename from fpdf/font/times.php3
rename to libraries/fpdf/font/times.php3
diff --git a/fpdf/font/timesb.php3 b/libraries/fpdf/font/timesb.php3
old mode 100755
new mode 100644
similarity index 100%
rename from fpdf/font/timesb.php3
rename to libraries/fpdf/font/timesb.php3
diff --git a/fpdf/font/timesbi.php3 b/libraries/fpdf/font/timesbi.php3
old mode 100755
new mode 100644
similarity index 100%
rename from fpdf/font/timesbi.php3
rename to libraries/fpdf/font/timesbi.php3
diff --git a/fpdf/font/timesi.php3 b/libraries/fpdf/font/timesi.php3
old mode 100755
new mode 100644
similarity index 100%
rename from fpdf/font/timesi.php3
rename to libraries/fpdf/font/timesi.php3
diff --git a/fpdf/font/zapfdingbats.php3 b/libraries/fpdf/font/zapfdingbats.php3
old mode 100755
new mode 100644
similarity index 100%
rename from fpdf/font/zapfdingbats.php3
rename to libraries/fpdf/font/zapfdingbats.php3
diff --git a/fpdf/fpdf.css b/libraries/fpdf/fpdf.css
old mode 100755
new mode 100644
similarity index 100%
rename from fpdf/fpdf.css
rename to libraries/fpdf/fpdf.css
diff --git a/fpdf/fpdf.php3 b/libraries/fpdf/fpdf.php3
old mode 100755
new mode 100644
similarity index 100%
rename from fpdf/fpdf.php3
rename to libraries/fpdf/fpdf.php3
diff --git a/pdf_schema.php3 b/pdf_schema.php3
index 44ae7dc53..c0ff167a8 100644
--- a/pdf_schema.php3
+++ b/pdf_schema.php3
@@ -16,8 +16,8 @@ require('./libraries/common.lib.php3');
 /**
  * Gets the "fpdf" libraries and defines the pdf font path
  */
-require('./fpdf/fpdf.php3');
-define('FPDF_FONTPATH', './fpdf/font/');
+require('./libraries/fpdf/fpdf.php3');
+define('FPDF_FONTPATH', './libraries/fpdf/font/');
 
 
 /**