diff --git a/phpMyAdmin-3.5.7-all-languages.tar.bz2 b/phpMyAdmin-3.5.7-all-languages.tar.bz2
deleted file mode 100644
index a0dc097..0000000
--- a/phpMyAdmin-3.5.7-all-languages.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a1d1c2301f5abd27373d85d7b1ce3a4c4981968241a2c7cd516669c46b224772
-size 4995434
diff --git a/phpMyAdmin-3.5.8-all-languages.tar.bz2 b/phpMyAdmin-3.5.8-all-languages.tar.bz2
new file mode 100644
index 0000000..3e9191a
--- /dev/null
+++ b/phpMyAdmin-3.5.8-all-languages.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:178812e5bf4a3f0f0b80c7789aa382f7bced0e928f165dbe58531c949fe8118e
+size 4976918
diff --git a/phpMyAdmin.changes b/phpMyAdmin.changes
index 4fe85fa..17ca66c 100644
--- a/phpMyAdmin.changes
+++ b/phpMyAdmin.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Apr  8 18:33:29 UTC 2013 - ecsos@schirra.net
+
+- update to 3.5.8 (2013-04-08)
+  * sf#3828 MariaDB reported as MySQL
+  * sf#3854 Incorrect header for Safari 6.0
+  * sf#3705 Attempt to open trigger for edit gives NULL
+  * Use HTML5 DOCTYPE
+  * [security] Self-XSS on GIS visualisation page, reported by Janek Vind
+  * sf#3800 Incorrect keyhandler behaviour #2
+
 -------------------------------------------------------------------
 Fri Mar 15 19:51:32 UTC 2013 - chris@computersalat.de
 
diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index 8455710..7d926ec 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -34,7 +34,7 @@ Name:           phpMyAdmin
 Summary:        Administration of MySQL over the web
 License:        GPL-2.0+
 Group:          Productivity/Networking/Web/Frontends
-Version:        3.5.7
+Version:        3.5.8
 Release:        0
 Url:            http://www.phpMyAdmin.net
 Source0:        %{name}-%{version}-all-languages.tar.bz2
@@ -110,7 +110,7 @@ find . -type f -name '*.orig' -exec rm {} \;
 %build
 
 %install
-#%{__install} -d -m0750 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
+#%%{__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 themes \
   $RPM_BUILD_ROOT%{ap_docroot}/%{name}
@@ -122,8 +122,8 @@ find . -type f -name '*.orig' -exec rm {} \;
 %{__sed} -i -e "s,@docdir@,%{_docdir}/%{name},g" -e "s,@sysconfdir@,%{_sysconfdir}/%{name},g" \
   $RPM_BUILD_ROOT%{ap_docroot}/%{name}/libraries/vendor_config.php
 # fix libraries/common.inc.php
-#%{__sed} -i -e "s,@PMA_Config@,%{_sysconfdir}/%{name}/config.inc.php,g" \
-#  $RPM_BUILD_ROOT%{ap_docroot}/%{name}/libraries/common.inc.php
+#%%{__sed} -i -e "s,@PMA_Config@,%%{_sysconfdir}/%%{name}/config.inc.php,g" \
+#  $RPM_BUILD_ROOT%%{ap_docroot}/%%{name}/libraries/common.inc.php
 
 # generate file list
 find $RPM_BUILD_ROOT%{ap_docroot}/%{name} -mindepth 1 -maxdepth 1 -type d | sed -e "s@$RPM_BUILD_ROOT@@" > FILELIST