diff --git a/phpMyAdmin-3.4.11-all-languages.tar.bz2 b/phpMyAdmin-3.4.11-all-languages.tar.bz2
deleted file mode 100644
index ab07507..0000000
--- a/phpMyAdmin-3.4.11-all-languages.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b26fca14d37be205c455c6ea0d9bf38ee6adc408741152b2e8ca01471a2b88bd
-size 4787560
diff --git a/phpMyAdmin-3.5.1-all-languages.tar.bz2 b/phpMyAdmin-3.5.1-all-languages.tar.bz2
new file mode 100644
index 0000000..837cec4
--- /dev/null
+++ b/phpMyAdmin-3.5.1-all-languages.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c4938855ad43c41a2c94b2f74c75a24819e01f55d800a347c8373557988b2da3
+size 4724343
diff --git a/phpMyAdmin-3.4.9-config.patch b/phpMyAdmin-config.patch
similarity index 75%
rename from phpMyAdmin-3.4.9-config.patch
rename to phpMyAdmin-config.patch
index c5456e3..8b22bc3 100644
--- a/phpMyAdmin-3.4.9-config.patch
+++ b/phpMyAdmin-config.patch
@@ -2,8 +2,8 @@ Index: config.sample.inc.php
 ===================================================================
 --- config.sample.inc.php.orig
 +++ config.sample.inc.php
-@@ -10,55 +10,223 @@
-  * @package phpMyAdmin
+@@ -10,59 +10,286 @@
+  * @package PhpMyAdmin
   */
  
 +/**
@@ -30,8 +30,10 @@ Index: config.sample.inc.php
   * This is needed for cookie based authentication to encrypt password in
   * cookie
   */
- $cfg['blowfish_secret'] = ''; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
- 
+-$cfg['blowfish_secret'] = 'a8b7c6d'; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
++/* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
++$cfg['blowfish_secret'] = '';
++
 +/**
 + * Disable the default warning about $cfg['PmaAbsoluteUri'] not being set
 + * You should use this if and ONLY if the PmaAbsoluteUri auto-detection
@@ -51,7 +53,7 @@ Index: config.sample.inc.php
 + * @global boolean $cfg['SuhosinDisableWarning']
 + */
 +$cfg['SuhosinDisableWarning'] = true;
-+
+ 
  /*
   * Servers configuration
   */
@@ -73,9 +75,7 @@ Index: config.sample.inc.php
 -$cfg['Servers'][$i]['AllowNoPassword'] = false;
 +// MySQL hostname or IP address
 +$cfg['Servers'][$i]['host']                = 'localhost';
- 
--/*
-- * phpMyAdmin configuration storage settings.
++
 +// MySQL port - leave blank for default port
 +$cfg['Servers'][$i]['port']                = '';
 +
@@ -94,12 +94,6 @@ Index: config.sample.inc.php
 +// Use compressed protocol for the MySQL connection (requires PHP >= 4.3.0)
 +$cfg['Servers'][$i]['compress']            = false;
 +
-+// MySQL control user settings (this user must have read-only
-+// access to the "mysql/user" and "mysql/db" tables).
-+// The controluser is also used for all relational features (pmadb)
-+$cfg['Servers'][$i]['controluser']         = '';
-+$cfg['Servers'][$i]['controlpass']         = '';
-+
 +// Authentication method (config, http or cookie based)?
 +$cfg['Servers'][$i]['auth_type']           = 'cookie';
 +
@@ -112,6 +106,9 @@ Index: config.sample.inc.php
 +// Allow access without password
 +$cfg['Servers'][$i]['AllowNoPassword']     = false;
 +
++// whether to allow root login
++$cfg['Servers'][$i]['AllowRoot']           = true;
++
 +// Session to use for 'signon' authentication method
 +$cfg['Servers'][$i]['SignonSession']       = '';
 +
@@ -128,8 +125,54 @@ Index: config.sample.inc.php
 +// Verbose name for this host - leave blank to show the hostname
 +$cfg['Servers'][$i]['verbose']             = '';
 +
++// set to false if you know that your pma_* tables
++// are up to date. This prevents compatibility
++// checks and thereby increases performance.
++$cfg['Servers'][$i]['verbose_check']       = true;
++
++// Host authentication order, leave blank to not use
++$cfg['Servers'][$i]['AllowDeny']['order']  = '';
++
++// Host authentication rules, leave blank for defaults
++$cfg['Servers'][$i]['AllowDeny']['rules']  = array();
+ 
+ /*
+  * phpMyAdmin configuration storage settings.
+  */
+ 
+-/* User used to manipulate with storage */
+-// $cfg['Servers'][$i]['controlhost'] = '';
+-// $cfg['Servers'][$i]['controluser'] = 'pma';
+-// $cfg['Servers'][$i]['controlpass'] = 'pmapass';
+-
+-/* Storage database and tables */
+-// $cfg['Servers'][$i]['pmadb'] = 'phpmyadmin';
+-// $cfg['Servers'][$i]['bookmarktable'] = 'pma_bookmark';
+-// $cfg['Servers'][$i]['relation'] = 'pma_relation';
+-// $cfg['Servers'][$i]['table_info'] = 'pma_table_info';
+-// $cfg['Servers'][$i]['table_coords'] = 'pma_table_coords';
+-// $cfg['Servers'][$i]['pdf_pages'] = 'pma_pdf_pages';
+-// $cfg['Servers'][$i]['column_info'] = 'pma_column_info';
+-// $cfg['Servers'][$i]['history'] = 'pma_history';
+-// $cfg['Servers'][$i]['table_uiprefs'] = 'pma_table_uiprefs';
+-// $cfg['Servers'][$i]['tracking'] = 'pma_tracking';
+-// $cfg['Servers'][$i]['designer_coords'] = 'pma_designer_coords';
+-// $cfg['Servers'][$i]['userconfig'] = 'pma_userconfig';
+-// $cfg['Servers'][$i]['recent'] = 'pma_recent';
+-// $cfg['Servers'][$i]['table_uiprefs'] = 'pma_table_uiprefs';
++$cfg['Servers'][$i]['controlhost']         = '';
++
++// MySQL control user settings (this user must have read-only
++// access to the "mysql/user" and "mysql/db" tables).
++// The controluser is also used for all relational features (pmadb)
++$cfg['Servers'][$i]['controluser']         = '';
++
++// The password needed for the controluser to login
++// (see $cfg['Servers'][$i]['controluser'])
++$cfg['Servers'][$i]['controlpass']         = '';
++
 +// Database used for Relation, Bookmark and PDF Features
-+// (see scripts/create_tables.sql)
++// (see _docdir/examples/create_tables.sql)
 +//   - leave blank for no support
 +//     DEFAULT: 'phpmyadmin'
 +$cfg['Servers'][$i]['pmadb']               = '';
@@ -169,63 +212,84 @@ Index: config.sample.inc.php
 +//     DEFAULT: 'pma_history'
 +$cfg['Servers'][$i]['history']             = '';
 +
-+// set to false if you know that your pma_* tables
-+// are up to date. This prevents compatibility
-+// checks and thereby increases performance.
-+$cfg['Servers'][$i]['verbose_check']       = true;
++// Table to store user interface enhancement data.
++//   - Leave blank to disable.
++//     DEFAULT: 'pma_table_uiprefs'
++$cfg['Servers'][$i]['table_uiprefs']       = 'pma_table_uiprefs';
 +
-+// whether to allow root login
-+$cfg['Servers'][$i]['AllowRoot']           = true;
++// Table to store version/change tracking data
++//   - leave blank to disable
++//     DEFAULT: 'pma_tracking'
++$cfg['Servers'][$i]['tracking']            = 'pma_tracking';
 +
-+// Host authentication order, leave blank to not use
-+$cfg['Servers'][$i]['AllowDeny']['order']  = '';
++// Table in which to store information for the designer feature.
++//     DEFAULT: 'pma_designer_coords'
++$cfg['Servers'][$i]['designer_coords']     = 'pma_designer_coords';
 +
-+// Host authentication rules, leave blank for defaults
-+$cfg['Servers'][$i]['AllowDeny']['rules']  = array();
++// Table to store user preferences -- allows users to set most
++// preferences by themselves and store them in the phpMyAdmin
++// configuration storage database.
++// If you don't allow for storing preferences in pmadb, users can
++// still personalize phpMyAdmin, but settings will be saved in
++// browser's local storage, or, it is is unavailable, until the end
++// of session.
++//    DEFAULT: 'pma_userconfig'
++$cfg['Servers'][$i]['userconfig']          = 'pma_userconfig';
++
++// Table to store a list of recently used tables to be shown in the
++// left navigation frame. It helps you to jump across table directly,
++// without the need to select the database, and then select the table.
++// Using $cfg['LeftRecentTable'] you can configure the maximum number
++// of recent tables shown.
++// Without configuring the storage, you can still access the recently
++// used tables, but it will disappear after you logout.
++//   DEFAULT: 'pma_recent'
++$cfg['Servers'][$i]['recent']              = 'pma_recent';
++
+ /* Contrib / Swekey authentication */
+-// $cfg['Servers'][$i]['auth_swekey_config'] = '/etc/swekey-pma.conf';
++// The name of the file containing Swekey ids and login names for
++// hardware authentication. Leave the string empty to deactivate this
++// feature.
++// see _docdir/examples/swekey.sample.conf
++//$cfg['Servers'][$i]['auth_swekey_config']  = '/etc/phpMyAdmin/swekey-pma.conf';
 +
 +
 +/***************************************
 + * Second Server
-  */
- 
--/* User used to manipulate with storage */
--// $cfg['Servers'][$i]['controluser'] = 'pma';
--// $cfg['Servers'][$i]['controlpass'] = 'pmapass';
--
--/* Storage database and tables */
--// $cfg['Servers'][$i]['pmadb'] = 'phpmyadmin';
--// $cfg['Servers'][$i]['bookmarktable'] = 'pma_bookmark';
--// $cfg['Servers'][$i]['relation'] = 'pma_relation';
--// $cfg['Servers'][$i]['table_info'] = 'pma_table_info';
--// $cfg['Servers'][$i]['table_coords'] = 'pma_table_coords';
--// $cfg['Servers'][$i]['pdf_pages'] = 'pma_pdf_pages';
--// $cfg['Servers'][$i]['column_info'] = 'pma_column_info';
--// $cfg['Servers'][$i]['history'] = 'pma_history';
--// $cfg['Servers'][$i]['tracking'] = 'pma_tracking';
--// $cfg['Servers'][$i]['designer_coords'] = 'pma_designer_coords';
--// $cfg['Servers'][$i]['userconfig'] = 'pma_userconfig';
--/* Contrib / Swekey authentication */
--// $cfg['Servers'][$i]['auth_swekey_config'] = '/etc/swekey-pma.conf';
++ */
++
 +/**
 +$i++;
-+$cfg['Servers'][$i]['host']                = '';
++$cfg['Servers'][$i]['host']                = 'localhost';
 +$cfg['Servers'][$i]['port']                = '';
 +$cfg['Servers'][$i]['socket']              = '';
 +$cfg['Servers'][$i]['ssl']                 = false;
-+$cfg['Servers'][$i]['connect_type']        = 'tcp';
++$cfg['Servers'][$i]['connect_type']        = 'socket';
 +$cfg['Servers'][$i]['extension']           = 'mysqli';
 +$cfg['Servers'][$i]['compress']            = false;
-+$cfg['Servers'][$i]['controluser']         = '';
-+$cfg['Servers'][$i]['controlpass']         = '';
-+$cfg['Servers'][$i]['auth_type']           = 'http';
++$cfg['Servers'][$i]['auth_type']           = 'cookie';
 +$cfg['Servers'][$i]['user']                = 'root';
 +$cfg['Servers'][$i]['password']            = '';
 +$cfg['Servers'][$i]['AllowNoPassword']     = false;
++$cfg['Servers'][$i]['AllowRoot']           = true;
 +$cfg['Servers'][$i]['SignonSession']       = '';
 +$cfg['Servers'][$i]['SignonURL']           = '';
 +$cfg['Servers'][$i]['LogoutURL']           = '';
 +$cfg['Servers'][$i]['only_db']             = '';
 +$cfg['Servers'][$i]['verbose']             = '';
++$cfg['Servers'][$i]['verbose_check']       = true;
++$cfg['Servers'][$i]['AllowDeny']['order']  = '';
++$cfg['Servers'][$i]['AllowDeny']['rules']  = array();
+ 
+ /*
++ * phpMyAdmin configuration storage settings.
++ */
++
++/**
++$cfg['Servers'][$i]['controlhost']         = '';
++$cfg['Servers'][$i]['controluser']         = '';
++$cfg['Servers'][$i]['controlpass']         = '';
 +$cfg['Servers'][$i]['pmadb']               = '';
 +$cfg['Servers'][$i]['bookmarktable']       = '';
 +$cfg['Servers'][$i]['relation']            = '';
@@ -234,10 +298,12 @@ Index: config.sample.inc.php
 +$cfg['Servers'][$i]['pdf_pages']           = '';
 +$cfg['Servers'][$i]['column_info']         = '';
 +$cfg['Servers'][$i]['history']             = '';
-+$cfg['Servers'][$i]['verbose_check']       = true;
-+$cfg['Servers'][$i]['AllowRoot']           = true;
-+$cfg['Servers'][$i]['AllowDeny']['order']  = '';
-+$cfg['Servers'][$i]['AllowDeny']['rules']  = array();
++$cfg['Servers'][$i]['table_uiprefs']       = 'pma_table_uiprefs';
++$cfg['Servers'][$i]['tracking']            = 'pma_tracking';
++$cfg['Servers'][$i]['designer_coords']     = 'pma_designer_coords';
++$cfg['Servers'][$i]['userconfig']          = 'pma_userconfig';
++$cfg['Servers'][$i]['recent']              = 'pma_recent';
++$cfg['Servers'][$i]['auth_swekey_config']  = '/etc/phpMyAdmin/swekey-pma_02.conf';
 + */
 +
 +// If you have more than one server configured, you can set $cfg['ServerDefault']
@@ -250,8 +316,6 @@ Index: config.sample.inc.php
 +$cfg['ServerDefault'] = 1;
 +$cfg['Server']        = '0';
 +unset($cfg['Servers'][0]);
- 
--/*
 +
 +/***************************************
   * End of servers configuration
diff --git a/phpMyAdmin.changes b/phpMyAdmin.changes
index abb1f94..bf4e7b8 100644
--- a/phpMyAdmin.changes
+++ b/phpMyAdmin.changes
@@ -1,3 +1,41 @@
+-------------------------------------------------------------------
+Sun Jun  3 22:00:45 UTC 2012 - chris@computersalat.de
+
+- update to 3.5.1.0 (2012-05-03)
+  * bug sf#3510784 [edit] Limit clause ignored when sort order is
+     remembered
+  * bug sf#3511471 [interface] View name not seen in navi panel
+     (MySQL 5.1)
+  * bug sf#3512916 [display] Right frame reloads after displaying SQL
+     result(zero rows)
+  * bug [interface] Fixed missing Codemirror for inline query edit
+     when exporting a result set
+  * bug sf#3514490 [auth] Multiple Navigation panels bug still present
+  * bug sf#3515181 [users] Error in create user + underscore + create
+     database
+  * bug sf#3515666 [display] Profiling chart shows wrong data
+  * bug sf#3516037 [auth] JS includes missing in auth config error page
+  * bug sf#3516183 [display] Missing image extension
+  * bug [display] Added missing icons in original theme
+  * bug sf#3516761 [edit] Query error after search
+  * bug sf#3516405 [display] Chart title is getting wrong within chart
+     export
+  * bug sf#3517021 [interface] Header links except 'More' hide after
+     closing dialog
+  * bug sf#3516817 [interface] "More" actions in table structure
+  * bug sf#3518484 [privileges] PMA_sqlAddSlashes() does not quote the
+    table names correctly
+  * bug sf#3518983 [designer] Error messages do not appear in the
+     Designer
+  * bug sf#3519747 [interface] Suhosin patch warning incorrectly
+     displayed
+  * bug sf#3520107 [interface] Server status page: Incorrect dialog box
+     titles
+  * bug sf#3516089 [structure] DROP does not work on defective VIEWs
+- rebase config patch
+  * remove version from patch name
+  * add missing options
+
 -------------------------------------------------------------------
 Thu Apr 26 19:49:16 UTC 2012 - chris@computersalat.de
 
diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index ad4f179..a2180ce 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -34,12 +34,12 @@ Name:           phpMyAdmin
 Summary:        Administration of MySQL over the web
 License:        GPL-2.0+
 Group:          Productivity/Networking/Web/Frontends
-Version:        3.4.11
+Version:        3.5.1
 Release:        0
 Url:            http://www.phpMyAdmin.net
 Source0:        %{name}-%{version}-all-languages.tar.bz2
 Source1:        %{name}.http
-Patch0:         %{name}-3.4.9-config.patch
+Patch0:         %{name}-config.patch
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         pwgen coreutils sed grep
@@ -109,7 +109,7 @@ find . -type f -name '*.orig' -exec rm {} \;
 %install
 #%{__install} -d -m0750 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 %{__install} -d -m0755 $RPM_BUILD_ROOT%{ap_docroot}/%{name}
-%{__cp} -dR *.css *.php *.html *.ico js libraries locale pmd themes \
+%{__cp} -dR *.css *.php *.html *.ico js libraries locale themes \
   $RPM_BUILD_ROOT%{ap_docroot}/%{name}
 # install config to config dir
 %{__install} -D -m0640 $RPM_BUILD_ROOT%{ap_docroot}/%{name}/config.sample.inc.php \
@@ -152,10 +152,9 @@ find $RPM_BUILD_ROOT%{ap_docroot}/%{name} -maxdepth 1 -type f | grep -v 'config.
 
 %files -f FILELIST
 %defattr(644,root,root,755)
-%doc CREDITS ChangeLog Documentation.* docs.css
-%doc LICENSE README RELEASE-DATE* TODO
-%doc contrib
-%doc scripts
+%doc ChangeLog Documentation.* docs.css
+%doc LICENSE README RELEASE-DATE*
+%doc examples
 %dir %attr(0750,root,%{ap_grp}) %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/config.inc.php
 %dir %{ap_docroot}/%{name}