diff --git a/phpMyAdmin-config.patch b/phpMyAdmin-config.patch
index effa137..4095e24 100644
--- a/phpMyAdmin-config.patch
+++ b/phpMyAdmin-config.patch
@@ -1,6 +1,7 @@
-diff -Pdpru phpMyAdmin-4.6.2-all-languages.orig/config.sample.inc.php phpMyAdmin-4.6.2-all-languages/config.sample.inc.php
---- phpMyAdmin-4.6.2-all-languages.orig/config.sample.inc.php	2016-05-25 19:07:44.000000000 +0200
-+++ phpMyAdmin-4.6.2-all-languages/config.sample.inc.php	2016-05-28 10:30:30.138092225 +0200
+Index: config.sample.inc.php
+===================================================================
+--- config.sample.inc.php.orig
++++ config.sample.inc.php
 @@ -11,13 +11,56 @@
   */
  
@@ -41,7 +42,7 @@ diff -Pdpru phpMyAdmin-4.6.2-all-languages.orig/config.sample.inc.php phpMyAdmin
 + * Default: en
 + */
 +/* $cfg['DefaultLang'] = 'de';
-+ 
++
 +/**
   * This is needed for cookie based authentication to encrypt password in
   * cookie
@@ -55,7 +56,7 @@ diff -Pdpru phpMyAdmin-4.6.2-all-languages.orig/config.sample.inc.php phpMyAdmin
   * Servers configuration
 + *
 + * for more info/explanation about these VARS have look at
-+ *  libraries/config.default.php 
++ *  libraries/config.default.php
   */
  $i = 0;
  
@@ -104,12 +105,7 @@ diff -Pdpru phpMyAdmin-4.6.2-all-languages.orig/config.sample.inc.php phpMyAdmin
 -// $cfg['Servers'][$i]['controlport'] = '';
 -// $cfg['Servers'][$i]['controluser'] = 'pma';
 -// $cfg['Servers'][$i]['controlpass'] = 'pmapass';
-+$cfg['Servers'][$i]['controlhost'] = 'localhost';
-+$cfg['Servers'][$i]['controlport'] = '';
-+/* 
-+$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';
@@ -133,6 +129,12 @@ diff -Pdpru phpMyAdmin-4.6.2-all-languages.orig/config.sample.inc.php phpMyAdmin
 -// $cfg['Servers'][$i]['export_templates'] = 'pma__export_templates';
 -/* Contrib / Swekey authentication */
 -// $cfg['Servers'][$i]['auth_swekey_config'] = '/etc/swekey-pma.conf';
++$cfg['Servers'][$i]['controlhost'] = 'localhost';
++$cfg['Servers'][$i]['controlport'] = '';
++/*
++$cfg['Servers'][$i]['controluser'] = 'pma';
++$cfg['Servers'][$i]['controlpass'] = 'pmapass';
++
 +/**
 + * The name of the database containing the phpMyAdmin configuration storage.
 + *
@@ -249,9 +251,10 @@ diff -Pdpru phpMyAdmin-4.6.2-all-languages.orig/config.sample.inc.php phpMyAdmin
  
  /**
   * End of servers configuration
-diff -Pdpru phpMyAdmin-4.6.2-all-languages.orig/libraries/vendor_config.php phpMyAdmin-4.6.2-all-languages/libraries/vendor_config.php
---- phpMyAdmin-4.6.2-all-languages.orig/libraries/vendor_config.php	2016-05-25 19:07:44.000000000 +0200
-+++ phpMyAdmin-4.6.2-all-languages/libraries/vendor_config.php	2016-05-28 10:33:10.089295600 +0200
+Index: libraries/vendor_config.php
+===================================================================
+--- libraries/vendor_config.php.orig
++++ libraries/vendor_config.php
 @@ -17,18 +17,18 @@ if (! defined('PHPMYADMIN')) {
   * Path to changelog file, can be gzip compressed. Useful when you want to
   * have documentation somewhere else, eg. /usr/share/doc.
diff --git a/phpMyAdmin.changes b/phpMyAdmin.changes
index 85e8038..6df2e89 100644
--- a/phpMyAdmin.changes
+++ b/phpMyAdmin.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun May 29 15:07:43 UTC 2016 - chris@computersalat.de
+
+- rebase phpMyAdmin-config.patch
+
 -------------------------------------------------------------------
 Sat May 28 07:33:29 UTC 2016 - ecsos@opensuse.org
 
diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index d854e88..818d1c6 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -111,7 +111,7 @@ Currently phpMyAdmin can:
 ## rpmlint:
 # wrong-file-end-of-line-encoding
 perl -p -i -e 's|\r\n|\n|' examples/config.manyhosts.inc.php
-%patch0 -p1
+%patch0
 %patch1
 
 # rpmlint: fix incorrect-fsf-address