diff -Nru amarok-2.8.0/debian/changelog amarok-2.8.0/debian/changelog
--- amarok-2.8.0/debian/changelog	2016-04-13 13:35:17.000000000 -0400
+++ amarok-2.8.0/debian/changelog	2016-04-16 14:38:44.000000000 -0400
@@ -1,3 +1,10 @@
+amarok (2:2.8.0-0ubuntu9) xenial; urgency=medium
+
+  * Add kubuntu_mysqle_myisam_recover_options.diff, based on
+    patch from https://bugs.kde.org/show_bug.cgi?id=354255 (LP:#1571215)
+
+ -- Michael Marley <michael@michaelmarley.com>  Sat, 16 Apr 2016 14:31:34 -0400
+
 amarok (2:2.8.0-0ubuntu8) xenial; urgency=medium
 
   * mysql-server-core does not exist; it is virtual-mysql-server-core. So fix
diff -Nru amarok-2.8.0/debian/patches/kubuntu_mysqle_myisam_recover_options.diff amarok-2.8.0/debian/patches/kubuntu_mysqle_myisam_recover_options.diff
--- amarok-2.8.0/debian/patches/kubuntu_mysqle_myisam_recover_options.diff	1969-12-31 19:00:00.000000000 -0500
+++ amarok-2.8.0/debian/patches/kubuntu_mysqle_myisam_recover_options.diff	2016-04-16 14:46:02.000000000 -0400
@@ -0,0 +1,31 @@
+From f941aaa00f4ecf2aad653a4eae41ca763b67b163 Mon Sep 17 00:00:00 2001
+From: Terje Rosten <terje.rosten@oracle.com>
+Date: Fri, 23 Oct 2015 12:11:43 +0200
+Subject: [PATCH] Deprecated MySQL option --myisam-recover has been removed in
+ MySQL 5.7, replacement is --myisam-recover-options
+
+Use MYSQL_VERSION_ID to handle this.
+
+Signed-off-by: Terje Rosten <terje.rosten@oracle.com>
+---
+ src/core-impl/collections/db/sql/mysqlecollection/MySqlEmbeddedStorage.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/core-impl/storage/sql/mysqlestorage/MySqlEmbeddedStorage.cpp b/src/core-impl/storage/sql/mysqlestorage/MySqlEmbeddedStorage.cpp
+index 4a9568f..9fa791b 100644
+--- a/src/core-impl/collections/db/sql/mysqlecollection/MySqlEmbeddedStorage.cpp
++++ b/src/core-impl/collections/db/sql/mysqlecollection/MySqlEmbeddedStorage.cpp
+@@ -70,7 +70,11 @@ MySqlEmbeddedStorage::init( const QString &storageLocation )
+         out << "default-storage-engine = MyISAM" << endl;
+         out << "loose-innodb = 0" << endl;
+         out << "skip-grant-tables = 1" << endl;
++#if (defined(MYSQL_VERSION_ID)) && (MYSQL_VERSION_ID >= 50700)
++        out << "myisam-recover-options = FORCE" << endl;
++#else
+         out << "myisam-recover = FORCE" << endl;
++#endif
+         out << "key_buffer_size = 16777216" << endl; // (16Mb)
+         out << "character-set-server = utf8" << endl;
+         out << "collation-server = utf8_bin" << endl;
+-- 
+2.1.0
diff -Nru amarok-2.8.0/debian/patches/series amarok-2.8.0/debian/patches/series
--- amarok-2.8.0/debian/patches/series	2015-08-24 18:33:20.000000000 -0400
+++ amarok-2.8.0/debian/patches/series	2016-04-16 14:37:07.000000000 -0400
@@ -6,3 +6,4 @@
 kubuntu_dont_ask_music_dir.diff
 kubuntu_mysql_pic_library_path.diff
 kubuntu_hide_amz.diff
+kubuntu_mysqle_myisam_recover_options.diff