diff --git a/lib/config.php b/lib/config.php
index c94eb27815..e04e96bc27 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -159,6 +159,9 @@ class OC_Config{
 		if (defined('DEBUG') && DEBUG) {
 			$content .= "define('DEBUG',true);\n";
 		}
+		if (defined('LOG_QUERIES') && LOG_QUERIES) {
+			$content .= "define('LOG_QUERIES',true);\n";
+		}
 		$content .= "\$CONFIG = ";
 		$content .= var_export(self::$cache, true);
 		$content .= ";\n";
diff --git a/lib/db.php b/lib/db.php
index 5a91421f7a..6bf8c74fce 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -367,7 +367,9 @@ class OC_DB {
 
 		// Optimize the query
 		$query = self::processQuery( $query );
-
+		if(defined('LOG_QUERIES') && LOG_QUERIES === true) {
+			OC_Log::write('core', 'DB prepare : '.$query, OC_Log::DEBUG);
+		}
 		self::connect();
 		// return the result
 		if(self::$backend==self::BACKEND_MDB2) {
@@ -952,6 +954,10 @@ class PDOStatementWrapper{
 	 * make execute return the result instead of a bool
 	 */
 	public function execute($input=array()) {
+		if(defined('LOG_QUERIES') && LOG_QUERIES === true) {
+			$params_str = str_replace("\n"," ",var_export($input,true));
+			OC_Log::write('core', 'DB execute with arguments : '.$params_str, OC_Log::DEBUG);
+		}
 		$this->lastArguments = $input;
 		if (count($input) > 0) {