diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php
index ba8a0e5545f..a3c9d81dcec 100644
--- a/htdocs/install/etape1.php
+++ b/htdocs/install/etape1.php
@@ -137,7 +137,7 @@ if ($_POST["action"] == "set")
     $dir[5] = "$main_data_dir/rapport";
     $dir[6] = "$main_data_dir/images";
     $dir[7] = "$main_data_dir/rsscache";
-		$dir[8] = "$main_data_dir/logo";
+    $dir[8] = "$main_data_dir/logo";
 
 		if (! is_dir($main_dir))
 		{
diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php
index 540cf589414..eafd89795f7 100644
--- a/htdocs/install/etape2.php
+++ b/htdocs/install/etape2.php
@@ -38,12 +38,12 @@ if($dolibarr_main_db_type == "mysql")
 }
 else
 {
-      require ($dolibarr_main_document_root . "/lib/pgsql.lib.php");
-		  require ($dolibarr_main_document_root . "/lib/grant.postgres.php");
+      require ($dolibarr_main_document_root . "/lib/pgsql.lib.php";
+      require ($dolibarr_main_document_root . "/lib/grant.postgres.php");
 			$choix=2;
 }
 			
-require ($dolibarr_main_document_root . "/conf/conf.class.php");// ne sert plus
+require ($dolibarr_main_document_root . "/conf/conf.class.php");
 
 if ($_POST["action"] == "set")
 {
diff --git a/htdocs/install/etape4.php b/htdocs/install/etape4.php
index 20f4a1ccbb5..09179a4ee96 100644
--- a/htdocs/install/etape4.php
+++ b/htdocs/install/etape4.php
@@ -30,9 +30,9 @@ if (file_exists($conf))
 }
 
 if($dolibarr_main_db_type == "mysql")
-			require ($dolibarr_main_document_root . "/lib/mysql.lib.php");		
+	require ($dolibarr_main_document_root . "/lib/mysql.lib.php");		
 else
-      require ($dolibarr_main_document_root . "/lib/pgsql.lib.php");
+	require ($dolibarr_main_document_root . "/lib/pgsql.lib.php");
 			
 
 
diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php
index 7a2b5176897..af0afb655af 100644
--- a/htdocs/install/etape5.php
+++ b/htdocs/install/etape5.php
@@ -33,9 +33,9 @@ if (file_exists($conf))
 
 
 if($dolibarr_main_db_type == "mysql")
-			require ($dolibarr_main_document_root . "/lib/mysql.lib.php");		
+	require ($dolibarr_main_document_root . "/lib/mysql.lib.php");		
 else
-      require ($dolibarr_main_document_root . "/lib/pgsql.lib.php");
+	require ($dolibarr_main_document_root . "/lib/pgsql.lib.php");
 			
 require ($dolibarr_main_document_root . "/conf/conf.class.php");
 
diff --git a/htdocs/public/dons/bplc.php b/htdocs/public/dons/bplc.php
index 60126bd1b94..3982ea222f9 100644
--- a/htdocs/public/dons/bplc.php
+++ b/htdocs/public/dons/bplc.php
@@ -27,13 +27,20 @@
  *
  */
 
-require("../../lib/mysql.lib.php");
 require("../../conf/conf.class.php");
 require("../../retourbplc.class.php");
 require("../../don.class.php");
 
 $conf = new Conf();
 
+conf->db->type = $dolibarr_main_db_type; 
+
+// Si type non défini (pour compatibilité avec ancienne install), on
+// travail avec mysql
+if (! $conf->db->type) { $conf->db->type = 'mysql'; }
+
+require (DOL_DOCUMENT_ROOT ."/lib/".$dolibarr_main_db_type.".lib.php");
+
 $db = new DoliDb();
 
 $retbplc = new Retourbplc($db);
diff --git a/htdocs/public/dons/depenses.xhtml b/htdocs/public/dons/depenses.xhtml
index ca0e0a8fa48..1359b2e8816 100644
--- a/htdocs/public/dons/depenses.xhtml
+++ b/htdocs/public/dons/depenses.xhtml
@@ -9,7 +9,7 @@
     <title>EUCD.INFO - Dépenses</title>
     <script language="php">
       require("../../conf/conf.class.php");
-      require("../../lib/mysql.lib.php3");
+      require("../../lib/mysql.lib.php");
     </script>
   </head>
 
diff --git a/htdocs/public/dons/donateurs.xhtml b/htdocs/public/dons/donateurs.xhtml
index 3cf40180402..550824cf9cb 100644
--- a/htdocs/public/dons/donateurs.xhtml
+++ b/htdocs/public/dons/donateurs.xhtml
@@ -9,7 +9,7 @@
     <title>Dons FSF France Projet EUCD.INFO</title>
     <script language="php">
       require("../../conf/conf.class.php");
-      require("../../lib/mysql.lib.php3");
+      require("../../lib/mysql.lib.php");
       require("../../don.class.php");
     </script>
   </head>
diff --git a/htdocs/public/dons/graph.xhtml b/htdocs/public/dons/graph.xhtml
index 4da59ec1319..69676040ed2 100644
--- a/htdocs/public/dons/graph.xhtml
+++ b/htdocs/public/dons/graph.xhtml
@@ -9,7 +9,7 @@
     <title>Dons FSF France Projet EUCD.INFO</title>
     <script language="php">
       require("../../conf/conf.class.php");
-      require("../../lib/mysql.lib.php3");
+      require("../../lib/mysql.lib.php");
       require("../../don.class.php");
     </script>
   </head>
diff --git a/htdocs/public/dons/index.php b/htdocs/public/dons/index.php
index 8de9358d034..4d74a6df036 100644
--- a/htdocs/public/dons/index.php
+++ b/htdocs/public/dons/index.php
@@ -21,11 +21,18 @@
  */
 
 require("../../don.class.php");
-require("../../lib/mysql.lib.php");
 require("../../conf/conf.class.php");
 
 $conf = new Conf();
 
+conf->db->type = $dolibarr_main_db_type;
+
+// Si type non défini (pour compatibilité avec ancienne install), on
+// travail avec mysql
+if (! $conf->db->type) { $conf->db->type = 'mysql'; }
+
+require("../../lib/.$dolibarr_main_db_type.lib.php");
+
 if ($conf->don->enabled)
 {