diff --git a/ChangeLog b/ChangeLog
index 7327e2d205..f4ec06a370 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -54,6 +54,7 @@ phpMyAdmin - ChangeLog
 - issue #12012 Column definition with default value and comment in CREATE TABLE expoerted faulty.
 - issue #12020 New statement but no delimiter and unexpected token with REPLACE.
 - issue #12029 Fixed incorrect usage of SQL parser context in SQL export
+- issue #12048 Fixed inclusion of gettext library from SQL parser
 
 4.5.5.0 (2016-02-22)
 - issue        Undefined index: is_ajax_request
diff --git a/libraries/sql-parser/autoload.php b/libraries/sql-parser/autoload.php
index 21298b6ced..f12057f211 100644
--- a/libraries/sql-parser/autoload.php
+++ b/libraries/sql-parser/autoload.php
@@ -67,7 +67,8 @@ class AutoloaderInit
 // This must be included before any class of the parser is loaded because
 // if there is no `__` function defined, the library defines a dummy one
 // in `common.php`.
-require_once './libraries/php-gettext/gettext.inc';
+require_once './libraries/vendor_config.php';
+require_once GETTEXT_INC;
 
 // Initializing the autoloader.
 return AutoloaderInit::getLoader(