diff --git a/phpmyadmin/.footprint b/phpmyadmin/.footprint
index 9040041f6..3c6e99f75 100644
--- a/phpmyadmin/.footprint
+++ b/phpmyadmin/.footprint
@@ -6,20 +6,14 @@ drwxr-xr-x	root/root	var/www/phpmyadmin/
 -rw-r--r--	root/root	var/www/phpmyadmin/calendar.php
 -rw-r--r--	root/root	var/www/phpmyadmin/changelog.php
 -rw-r--r--	root/root	var/www/phpmyadmin/chk_rel.php
--rw-r--r--	root/root	var/www/phpmyadmin/config.default.php
--rw-r--r--	root/root	var/www/phpmyadmin/config.footer.inc.php
--rw-r--r--	root/root	var/www/phpmyadmin/config.header.inc.php
 drwxr-xr-x	root/root	var/www/phpmyadmin/css/
 -rw-r--r--	root/root	var/www/phpmyadmin/css/phpmyadmin.css.php
 -rw-r--r--	root/root	var/www/phpmyadmin/css/print.css
 -rw-r--r--	root/root	var/www/phpmyadmin/db_create.php
 -rw-r--r--	root/root	var/www/phpmyadmin/db_datadict.php
 -rw-r--r--	root/root	var/www/phpmyadmin/db_details.php
--rw-r--r--	root/root	var/www/phpmyadmin/db_details_common.php
--rw-r--r--	root/root	var/www/phpmyadmin/db_details_db_info.php
 -rw-r--r--	root/root	var/www/phpmyadmin/db_details_export.php
 -rw-r--r--	root/root	var/www/phpmyadmin/db_details_importdocsql.php
--rw-r--r--	root/root	var/www/phpmyadmin/db_details_links.php
 -rw-r--r--	root/root	var/www/phpmyadmin/db_details_qbe.php
 -rw-r--r--	root/root	var/www/phpmyadmin/db_details_structure.php
 -rw-r--r--	root/root	var/www/phpmyadmin/db_import.php
@@ -29,17 +23,28 @@ drwxr-xr-x	root/root	var/www/phpmyadmin/css/
 -rw-r--r--	root/root	var/www/phpmyadmin/docs.css
 -rw-r--r--	root/root	var/www/phpmyadmin/error.php
 -rw-r--r--	root/root	var/www/phpmyadmin/export.php
--rw-r--r--	root/root	var/www/phpmyadmin/footer.inc.php
--rw-r--r--	root/root	var/www/phpmyadmin/header.inc.php
--rw-r--r--	root/root	var/www/phpmyadmin/header_printview.inc.php
 -rw-r--r--	root/root	var/www/phpmyadmin/import.php
 -rw-r--r--	root/root	var/www/phpmyadmin/index.php
+drwxr-xr-x	root/root	var/www/phpmyadmin/js/
+-rw-r--r--	root/root	var/www/phpmyadmin/js/dom-drag.js
+-rw-r--r--	root/root	var/www/phpmyadmin/js/functions.js
+-rw-r--r--	root/root	var/www/phpmyadmin/js/indexes.js
+-rw-r--r--	root/root	var/www/phpmyadmin/js/keyhandler.js
+-rw-r--r--	root/root	var/www/phpmyadmin/js/querywindow.js
+-rw-r--r--	root/root	var/www/phpmyadmin/js/server_privileges.js
+-rw-r--r--	root/root	var/www/phpmyadmin/js/tbl_change.js
+-rw-r--r--	root/root	var/www/phpmyadmin/js/tooltip.js
+-rw-r--r--	root/root	var/www/phpmyadmin/js/user_password.js
 drwxr-xr-x	root/root	var/www/phpmyadmin/lang/
 -rw-r--r--	root/root	var/www/phpmyadmin/lang/english-iso-8859-1.inc.php
 -rw-r--r--	root/root	var/www/phpmyadmin/lang/english-iso-8859-15.inc.php
 -rw-r--r--	root/root	var/www/phpmyadmin/lang/english-utf-8.inc.php
 -rw-r--r--	root/root	var/www/phpmyadmin/left.php
 drwxr-xr-x	root/root	var/www/phpmyadmin/libraries/
+-rw-r--r--	root/root	var/www/phpmyadmin/libraries/.htaccess
+-rw-r--r--	root/root	var/www/phpmyadmin/libraries/Config.class.php
+-rw-r--r--	root/root	var/www/phpmyadmin/libraries/Theme.class.php
+-rw-r--r--	root/root	var/www/phpmyadmin/libraries/Theme_Manager.class.php
 drwxr-xr-x	root/root	var/www/phpmyadmin/libraries/auth/
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/auth/config.auth.lib.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/auth/cookie.auth.lib.php
@@ -49,8 +54,12 @@ drwxr-xr-x	root/root	var/www/phpmyadmin/libraries/auth/
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/charset_conversion.lib.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/check_user_privileges.lib.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/common.lib.php
+-rw-r--r--	root/root	var/www/phpmyadmin/libraries/config.default.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/database_interface.lib.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/db_config.lib.php
+-rw-r--r--	root/root	var/www/phpmyadmin/libraries/db_details_common.inc.php
+-rw-r--r--	root/root	var/www/phpmyadmin/libraries/db_details_db_info.inc.php
+-rw-r--r--	root/root	var/www/phpmyadmin/libraries/db_details_links.inc.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/db_table_exists.lib.php
 drwxr-xr-x	root/root	var/www/phpmyadmin/libraries/dbg/
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/dbg/profiling.php
@@ -58,29 +67,36 @@ drwxr-xr-x	root/root	var/www/phpmyadmin/libraries/dbg/
 drwxr-xr-x	root/root	var/www/phpmyadmin/libraries/dbi/
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/dbi/mysql.dbi.lib.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/dbi/mysqli.dbi.lib.php
--rw-r--r--	root/root	var/www/phpmyadmin/libraries/defines.lib.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/display_create_database.lib.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/display_create_table.lib.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/display_export.lib.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/display_import.lib.php
+-rw-r--r--	root/root	var/www/phpmyadmin/libraries/display_select_lang.lib.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/display_tbl.lib.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/display_tbl_links.lib.php
--rw-r--r--	root/root	var/www/phpmyadmin/libraries/dom-drag.js
 drwxr-xr-x	root/root	var/www/phpmyadmin/libraries/engines/
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/engines/bdb.lib.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/engines/berkeleydb.lib.php
+-rw-r--r--	root/root	var/www/phpmyadmin/libraries/engines/binlog.lib.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/engines/innobase.lib.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/engines/innodb.lib.php
+-rw-r--r--	root/root	var/www/phpmyadmin/libraries/engines/memory.lib.php
+-rw-r--r--	root/root	var/www/phpmyadmin/libraries/engines/merge.lib.php
+-rw-r--r--	root/root	var/www/phpmyadmin/libraries/engines/mrg_myisam.lib.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/engines/myisam.lib.php
+-rw-r--r--	root/root	var/www/phpmyadmin/libraries/engines/ndbcluster.lib.php
 drwxr-xr-x	root/root	var/www/phpmyadmin/libraries/export/
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/export/csv.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/export/htmlexcel.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/export/htmlword.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/export/latex.php
+-rw-r--r--	root/root	var/www/phpmyadmin/libraries/export/pdf.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/export/sql.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/export/xls.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/export/xml.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/file_listing.php
+-rw-r--r--	root/root	var/www/phpmyadmin/libraries/footer.inc.php
+-rw-r--r--	root/root	var/www/phpmyadmin/libraries/footer_custom.inc.php
 drwxr-xr-x	root/root	var/www/phpmyadmin/libraries/fpdf/
 drwxr-xr-x	root/root	var/www/phpmyadmin/libraries/fpdf/font/
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/fpdf/font/FreeSans.ctg.z
@@ -104,35 +120,36 @@ drwxr-xr-x	root/root	var/www/phpmyadmin/libraries/fpdf/font/
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/fpdf/font/zapfdingbats.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/fpdf/fpdf.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/fpdf/ufpdf.php
--rw-r--r--	root/root	var/www/phpmyadmin/libraries/functions.js
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/get_foreign.lib.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/grab_globals.lib.php
+-rw-r--r--	root/root	var/www/phpmyadmin/libraries/header.inc.php
+-rw-r--r--	root/root	var/www/phpmyadmin/libraries/header_custom.inc.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/header_http.inc.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/header_meta_style.inc.php
+-rw-r--r--	root/root	var/www/phpmyadmin/libraries/header_printview.inc.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/import.lib.php
 drwxr-xr-x	root/root	var/www/phpmyadmin/libraries/import/
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/import/README
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/import/csv.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/import/ldi.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/import/sql.php
--rw-r--r--	root/root	var/www/phpmyadmin/libraries/indexes.js
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/information_schema_relations.lib.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/ip_allow_deny.lib.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/kanji-encoding.lib.php
--rw-r--r--	root/root	var/www/phpmyadmin/libraries/keyhandler.js
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/left_header.inc.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/mcrypt.lib.php
+-rw-r--r--	root/root	var/www/phpmyadmin/libraries/mult_submits.inc.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/mysql_charsets.lib.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/ob.lib.php
--rw-r--r--	root/root	var/www/phpmyadmin/libraries/querywindow.js
+-rw-r--r--	root/root	var/www/phpmyadmin/libraries/plugin_interface.lib.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/read_dump.lib.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/relation.lib.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/relation_cleanup.lib.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/sanitizing.lib.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/select_lang.lib.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/select_server.lib.php
--rw-r--r--	root/root	var/www/phpmyadmin/libraries/select_theme.lib.php
--rw-r--r--	root/root	var/www/phpmyadmin/libraries/server_privileges.js
+-rw-r--r--	root/root	var/www/phpmyadmin/libraries/server_common.inc.php
+-rw-r--r--	root/root	var/www/phpmyadmin/libraries/server_links.inc.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/session.inc.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/sql_query_form.lib.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/sqlparser.data.php
@@ -141,10 +158,13 @@ drwxr-xr-x	root/root	var/www/phpmyadmin/libraries/import/
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/sqlvalidator.lib.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/storage_engines.lib.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/string.lib.php
--rw-r--r--	root/root	var/www/phpmyadmin/libraries/tbl_change.js
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/tbl_indexes.lib.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/tbl_move_copy.php
--rw-r--r--	root/root	var/www/phpmyadmin/libraries/tooltip.js
+-rw-r--r--	root/root	var/www/phpmyadmin/libraries/tbl_properties.inc.php
+-rw-r--r--	root/root	var/www/phpmyadmin/libraries/tbl_properties_common.php
+-rw-r--r--	root/root	var/www/phpmyadmin/libraries/tbl_properties_links.inc.php
+-rw-r--r--	root/root	var/www/phpmyadmin/libraries/tbl_properties_table_info.inc.php
+-rw-r--r--	root/root	var/www/phpmyadmin/libraries/tbl_replace_fields.inc.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/transformations.lib.php
 drwxr-xr-x	root/root	var/www/phpmyadmin/libraries/transformations/
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/transformations/TEMPLATE
@@ -156,7 +176,6 @@ drwxr-xr-x	root/root	var/www/phpmyadmin/libraries/transformations/
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/transformations/image_jpeg__inline.inc.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/transformations/image_jpeg__link.inc.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/transformations/image_png__inline.inc.php
--rw-r--r--	root/root	var/www/phpmyadmin/libraries/transformations/overview.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/transformations/template_generator.sh
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/transformations/template_generator_mimetype.sh
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/transformations/text_plain__dateformat.inc.php
@@ -168,11 +187,9 @@ drwxr-xr-x	root/root	var/www/phpmyadmin/libraries/transformations/
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/transformations/text_plain__substr.inc.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/unzip.lib.php
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/url_generating.lib.php
--rw-r--r--	root/root	var/www/phpmyadmin/libraries/user_password.js
 -rw-r--r--	root/root	var/www/phpmyadmin/libraries/zip.lib.php
 -rw-r--r--	root/root	var/www/phpmyadmin/license.php
 -rw-r--r--	root/root	var/www/phpmyadmin/main.php
--rw-r--r--	root/root	var/www/phpmyadmin/mult_submits.inc.php
 -rw-r--r--	root/root	var/www/phpmyadmin/pdf_pages.php
 -rw-r--r--	root/root	var/www/phpmyadmin/pdf_schema.php
 -rw-r--r--	root/root	var/www/phpmyadmin/phpinfo.php
@@ -180,12 +197,10 @@ drwxr-xr-x	root/root	var/www/phpmyadmin/libraries/transformations/
 -rw-r--r--	root/root	var/www/phpmyadmin/readme.php
 -rw-r--r--	root/root	var/www/phpmyadmin/server_binlog.php
 -rw-r--r--	root/root	var/www/phpmyadmin/server_collations.php
--rw-r--r--	root/root	var/www/phpmyadmin/server_common.inc.php
 -rw-r--r--	root/root	var/www/phpmyadmin/server_databases.php
 -rw-r--r--	root/root	var/www/phpmyadmin/server_engines.php
 -rw-r--r--	root/root	var/www/phpmyadmin/server_export.php
 -rw-r--r--	root/root	var/www/phpmyadmin/server_import.php
--rw-r--r--	root/root	var/www/phpmyadmin/server_links.inc.php
 -rw-r--r--	root/root	var/www/phpmyadmin/server_privileges.php
 -rw-r--r--	root/root	var/www/phpmyadmin/server_processlist.php
 -rw-r--r--	root/root	var/www/phpmyadmin/server_sql.php
@@ -200,19 +215,12 @@ drwxr-xr-x	root/root	var/www/phpmyadmin/libraries/transformations/
 -rw-r--r--	root/root	var/www/phpmyadmin/tbl_indexes.php
 -rw-r--r--	root/root	var/www/phpmyadmin/tbl_move_copy.php
 -rw-r--r--	root/root	var/www/phpmyadmin/tbl_printview.php
--rw-r--r--	root/root	var/www/phpmyadmin/tbl_properties.inc.php
 -rw-r--r--	root/root	var/www/phpmyadmin/tbl_properties.php
--rw-r--r--	root/root	var/www/phpmyadmin/tbl_properties_common.php
 -rw-r--r--	root/root	var/www/phpmyadmin/tbl_properties_export.php
--rw-r--r--	root/root	var/www/phpmyadmin/tbl_properties_links.php
 -rw-r--r--	root/root	var/www/phpmyadmin/tbl_properties_operations.php
 -rw-r--r--	root/root	var/www/phpmyadmin/tbl_properties_structure.php
--rw-r--r--	root/root	var/www/phpmyadmin/tbl_properties_table_info.php
--rw-r--r--	root/root	var/www/phpmyadmin/tbl_query_box.php
 -rw-r--r--	root/root	var/www/phpmyadmin/tbl_relation.php
--rw-r--r--	root/root	var/www/phpmyadmin/tbl_rename.php
 -rw-r--r--	root/root	var/www/phpmyadmin/tbl_replace.php
--rw-r--r--	root/root	var/www/phpmyadmin/tbl_replace_fields.php
 -rw-r--r--	root/root	var/www/phpmyadmin/tbl_row_action.php
 -rw-r--r--	root/root	var/www/phpmyadmin/tbl_select.php
 -rw-r--r--	root/root	var/www/phpmyadmin/themes.php
@@ -460,6 +468,7 @@ drwxr-xr-x	root/root	var/www/phpmyadmin/themes/original/img/
 -rw-r--r--	root/root	var/www/phpmyadmin/themes/original/info.inc.php
 -rw-r--r--	root/root	var/www/phpmyadmin/themes/original/layout.inc.php
 -rw-r--r--	root/root	var/www/phpmyadmin/themes/original/screen.png
+-rw-r--r--	root/root	var/www/phpmyadmin/transformation_overview.php
 -rw-r--r--	root/root	var/www/phpmyadmin/transformation_wrapper.php
 -rw-r--r--	root/root	var/www/phpmyadmin/translators.html
 -rw-r--r--	root/root	var/www/phpmyadmin/user_password.php
diff --git a/phpmyadmin/.md5sum b/phpmyadmin/.md5sum
index d939dc56b..ebb5001ae 100644
--- a/phpmyadmin/.md5sum
+++ b/phpmyadmin/.md5sum
@@ -1 +1 @@
-19a46b06254276f4e7c3803ea2d9b335  phpMyAdmin-2.7.0-pl2.tar.bz2
+1ef0b82402b1d43c2be32521baef8b7e  phpMyAdmin-2.8.0.1.tar.bz2
diff --git a/phpmyadmin/Pkgfile b/phpmyadmin/Pkgfile
index 628a05f29..fba58b783 100644
--- a/phpmyadmin/Pkgfile
+++ b/phpmyadmin/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on:  mod_php
 
 name=phpmyadmin
-version=2.7.0-pl2
+version=2.8.0.1
 release=1
 source=(http://dl.sourceforge.net/sourceforge/$name/phpMyAdmin-$version.tar.bz2)
 
@@ -13,11 +13,11 @@ build () {
     mkdir -p $PKG/var/www
     cp -R phpMyAdmin-$version $PKG/var/www/phpmyadmin
     cd $PKG/var/www/phpmyadmin
-    rm -r scripts
+    rm -r scripts test
     rm libraries/{fpdf,transformations}/README 
     find lang/* -path "*/english*.inc.php" -or -exec rm {} \;
     find  -maxdepth 1 -type f | egrep -v '.*php|.*html|.*css' | xargs rm
     find -type f -exec chmod -x {} \;
-    sed -i -e '50,76d' -e '80,167d' libraries/select_lang.lib.php
-    sed -i '367s|^// ||' config.default.php
+    sed -i -e '207,233d' -e '237,324d' libraries/select_lang.lib.php
+    sed -i '377s|^// ||' libraries/config.default.php
 }