diff --git a/.travis.yml b/.travis.yml
index b608dfebe..4e3840728 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -53,6 +53,7 @@ matrix:
 branches:
   only:
     - master
+    - travis
 
 cache:
   directories:
@@ -74,6 +75,11 @@ before_install:
   # The Nextcloud version in the master branch is almost always one which is not yet officially supported by the Music app. To enable testing, hack the supported NC version to a high value.
   - sh -c "if [ '$CLOUD' = 'nextcloud' ] && [ $CORE_VER = 'master' ]; then sed -i -r 's/(<nextcloud min-version=\"..\" max-version=\")../\1255/g' appinfo/info.xml; fi;"
   
+  # Nextcloud has deprecated the use of database.xml to specify the database schema a long time ago, and NC22 removes the support entirely.
+  # Meanwhile, the replacement "Migrations" system does not work with ownCloud which still happily uses database.xml. To overcome this, our source 
+  # repository contains both mechanisms. The database.xml is deleted when deploying for NC, and the migrations script is disregarded by oC by default.
+  - if [[ "$CLOUD" == 'nextcloud' ]]; then rm appinfo/database.xml; fi
+  
   - cd ..
   - sh -c "if [ '$CLOUD' = 'nextcloud' ]; then git clone https://github.com/nextcloud/server.git --recursive --depth 1 -b $CORE_VER core; fi;"
   - sh -c "if [ '$CLOUD' = 'owncloud' ]; then wget https://download.owncloud.org/community/owncloud-${CORE_VER}.zip; unzip owncloud-${CORE_VER}.zip; mv owncloud core; fi;"
diff --git a/build/Makefile b/build/Makefile
index 5b3cfccbd..73892ba0f 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -60,4 +60,8 @@ release:
 	zip -d music/music.zip "music/js/*.js*" && \
 	zip -d music/music.zip "music/js/*/*" && \
 	zip -d music/music.zip "music/l10n/*/*" && \
-	zip -d music/music.zip "music/tests/*"
+	zip -d music/music.zip "music/tests/*" && \
+	cp music/music.zip music/music-nc.zip && \
+	mv music/music.zip music/music-oc.zip && \
+	zip -d music/music-nc.zip "music/appinfo/database.xml" && \
+	zip -d music/music-oc.zip "music/lib/Migration/Version*Date*.php"
diff --git a/lib/Migration/Version010200Date20210513171803.php b/lib/Migration/Version010200Date20210513171803.php
new file mode 100644
index 000000000..5b3d1c7bc
--- /dev/null
+++ b/lib/Migration/Version010200Date20210513171803.php
@@ -0,0 +1,401 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OCA\Music\Migration;
+
+use Closure;
+use OCP\DB\ISchemaWrapper;
+use OCP\Migration\SimpleMigrationStep;
+use OCP\Migration\IOutput;
+
+/**
+ * Auto-generated migration step: Please modify to your needs!
+ */
+class Version010200Date20210513171803 extends SimpleMigrationStep {
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+	 * @param array $options
+	 */
+	public function preSchemaChange(IOutput $output, Closure $schemaClosure, array $options) {
+	}
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+	 * @param array $options
+	 * @return null|ISchemaWrapper
+	 */
+	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
+		/** @var ISchemaWrapper $schema */
+		$schema = $schemaClosure();
+
+		if (!$schema->hasTable('music_artists')) {
+			$table = $schema->createTable('music_artists');
+			$table->addColumn('id', 'integer', [
+				'autoincrement' => true,
+				'notnull' => true,
+				'unsigned' => true,
+			]);
+			$table->addColumn('user_id', 'string', [
+				'notnull' => true,
+				'length' => 64,
+			]);
+			$table->addColumn('name', 'string', [
+				'notnull' => false,
+				'length' => 256,
+			]);
+			$table->addColumn('cover_file_id', 'bigint', [
+				'notnull' => false,
+				'length' => 10,
+			]);
+			$table->addColumn('mbid', 'string', [
+				'notnull' => false,
+				'length' => 36,
+			]);
+			$table->addColumn('hash', 'string', [
+				'notnull' => true,
+				'length' => 32,
+			]);
+			$table->addColumn('starred', 'datetime', [
+				'notnull' => false,
+			]);
+			$table->addColumn('created', 'datetime', [
+				'notnull' => false,
+			]);
+			$table->addColumn('updated', 'datetime', [
+				'notnull' => false,
+			]);
+			$table->setPrimaryKey(['id']);
+			$table->addUniqueIndex(['user_id', 'hash'], 'user_id_hash_idx');
+		}
+
+		if (!$schema->hasTable('music_albums')) {
+			$table = $schema->createTable('music_albums');
+			$table->addColumn('id', 'integer', [
+				'autoincrement' => true,
+				'notnull' => true,
+				'unsigned' => true,
+			]);
+			$table->addColumn('user_id', 'string', [
+				'notnull' => true,
+				'length' => 64,
+			]);
+			$table->addColumn('name', 'string', [
+				'notnull' => false,
+				'length' => 256,
+			]);
+			$table->addColumn('cover_file_id', 'bigint', [
+				'notnull' => false,
+				'length' => 10,
+			]);
+			$table->addColumn('mbid', 'string', [
+				'notnull' => false,
+				'length' => 36,
+			]);
+			$table->addColumn('disk', 'integer', [
+				'notnull' => false,
+				'unsigned' => true,
+			]);
+			$table->addColumn('mbid_group', 'string', [
+				'notnull' => false,
+				'length' => 36,
+			]);
+			$table->addColumn('album_artist_id', 'integer', [
+				'notnull' => false,
+			]);
+			$table->addColumn('hash', 'string', [
+				'notnull' => true,
+				'length' => 32,
+			]);
+			$table->addColumn('starred', 'datetime', [
+				'notnull' => false,
+			]);
+			$table->addColumn('created', 'datetime', [
+				'notnull' => false,
+			]);
+			$table->addColumn('updated', 'datetime', [
+				'notnull' => false,
+			]);
+			$table->setPrimaryKey(['id']);
+			$table->addIndex(['cover_file_id'], 'ma_cover_file_id_idx');
+			$table->addIndex(['album_artist_id'], 'ma_album_artist_id_idx');
+			$table->addUniqueIndex(['user_id', 'hash'], 'ma_user_id_hash_idx');
+		}
+
+		if (!$schema->hasTable('music_tracks')) {
+			$table = $schema->createTable('music_tracks');
+			$table->addColumn('id', 'integer', [
+				'autoincrement' => true,
+				'notnull' => true,
+				'unsigned' => true,
+			]);
+			$table->addColumn('user_id', 'string', [
+				'notnull' => true,
+				'length' => 64,
+			]);
+			$table->addColumn('title', 'string', [
+				'notnull' => true,
+				'length' => 256,
+			]);
+			$table->addColumn('number', 'integer', [
+				'notnull' => false,
+				'unsigned' => true,
+			]);
+			$table->addColumn('disk', 'integer', [
+				'notnull' => false,
+				'unsigned' => true,
+			]);
+			$table->addColumn('year', 'integer', [
+				'notnull' => false,
+				'unsigned' => true,
+			]);
+			$table->addColumn('artist_id', 'integer', [
+				'notnull' => false,
+			]);
+			$table->addColumn('album_id', 'integer', [
+				'notnull' => false,
+			]);
+			$table->addColumn('length', 'integer', [
+				'notnull' => false,
+				'unsigned' => true,
+			]);
+			$table->addColumn('file_id', 'bigint', [
+				'notnull' => true,
+				'length' => 10,
+			]);
+			$table->addColumn('bitrate', 'integer', [
+				'notnull' => false,
+				'unsigned' => true,
+			]);
+			$table->addColumn('mimetype', 'string', [
+				'notnull' => true,
+				'length' => 256,
+			]);
+			$table->addColumn('mbid', 'string', [
+				'notnull' => false,
+				'length' => 36,
+			]);
+			$table->addColumn('starred', 'datetime', [
+				'notnull' => false,
+			]);
+			$table->addColumn('genre_id', 'integer', [
+				'notnull' => false,
+				'unsigned' => true,
+			]);
+			$table->addColumn('created', 'datetime', [
+				'notnull' => false,
+			]);
+			$table->addColumn('updated', 'datetime', [
+				'notnull' => false,
+			]);
+			$table->setPrimaryKey(['id']);
+			$table->addIndex(['artist_id'], 'music_tracks_artist_id_idx');
+			$table->addIndex(['album_id'], 'music_tracks_album_id_idx');
+			$table->addIndex(['user_id'], 'music_tracks_user_id_idx');
+			$table->addUniqueIndex(['file_id', 'user_id'], 'music_tracks_file_user_id_idx');
+		}
+
+		if (!$schema->hasTable('music_playlists')) {
+			$table = $schema->createTable('music_playlists');
+			$table->addColumn('id', 'integer', [
+				'autoincrement' => true,
+				'notnull' => true,
+				'unsigned' => true,
+			]);
+			$table->addColumn('user_id', 'string', [
+				'notnull' => true,
+				'length' => 64,
+			]);
+			$table->addColumn('name', 'string', [
+				'notnull' => false,
+				'length' => 256,
+			]);
+			$table->addColumn('track_ids', 'text', [
+				'notnull' => false,
+			]);
+			$table->addColumn('created', 'datetime', [
+				'notnull' => false,
+			]);
+			$table->addColumn('updated', 'datetime', [
+				'notnull' => false,
+			]);
+			$table->addColumn('comment', 'string', [
+				'notnull' => false,
+				'length' => 256,
+			]);
+			$table->setPrimaryKey(['id']);
+		}
+
+		if (!$schema->hasTable('music_genres')) {
+			$table = $schema->createTable('music_genres');
+			$table->addColumn('id', 'integer', [
+				'autoincrement' => true,
+				'notnull' => true,
+				'unsigned' => true,
+			]);
+			$table->addColumn('user_id', 'string', [
+				'notnull' => true,
+				'length' => 64,
+			]);
+			$table->addColumn('name', 'string', [
+				'notnull' => false,
+				'length' => 64,
+			]);
+			$table->addColumn('lower_name', 'string', [
+				'notnull' => false,
+				'length' => 64,
+			]);
+			$table->addColumn('created', 'datetime', [
+				'notnull' => false,
+			]);
+			$table->addColumn('updated', 'datetime', [
+				'notnull' => false,
+			]);
+			$table->setPrimaryKey(['id']);
+			$table->addUniqueIndex(['lower_name', 'user_id'], 'mg_lower_name_user_id_idx');
+		}
+
+		if (!$schema->hasTable('music_radio_stations')) {
+			$table = $schema->createTable('music_radio_stations');
+			$table->addColumn('id', 'integer', [
+				'autoincrement' => true,
+				'notnull' => true,
+				'unsigned' => true,
+			]);
+			$table->addColumn('user_id', 'string', [
+				'notnull' => true,
+				'length' => 64,
+			]);
+			$table->addColumn('name', 'string', [
+				'notnull' => false,
+				'length' => 256,
+			]);
+			$table->addColumn('stream_url', 'string', [
+				'notnull' => true,
+				'length' => 2048,
+			]);
+			$table->addColumn('home_url', 'string', [
+				'notnull' => false,
+				'length' => 2048,
+			]);
+			$table->addColumn('created', 'datetime', [
+				'notnull' => false,
+			]);
+			$table->addColumn('updated', 'datetime', [
+				'notnull' => false,
+			]);
+			$table->setPrimaryKey(['id']);
+		}
+
+		if (!$schema->hasTable('music_ampache_sessions')) {
+			$table = $schema->createTable('music_ampache_sessions');
+			$table->addColumn('id', 'integer', [
+				'autoincrement' => true,
+				'notnull' => true,
+				'unsigned' => true,
+			]);
+			$table->addColumn('user_id', 'string', [
+				'notnull' => true,
+				'length' => 64,
+			]);
+			$table->addColumn('token', 'string', [
+				'notnull' => true,
+				'length' => 64,
+			]);
+			$table->addColumn('expiry', 'integer', [
+				'notnull' => true,
+				'unsigned' => true,
+			]);
+			$table->setPrimaryKey(['id']);
+			$table->addUniqueIndex(['token'], 'music_ampache_sessions_index');
+		}
+
+		if (!$schema->hasTable('music_ampache_users')) {
+			$table = $schema->createTable('music_ampache_users');
+			$table->addColumn('id', 'integer', [
+				'autoincrement' => true,
+				'notnull' => true,
+				'length' => 4,
+			]);
+			$table->addColumn('user_id', 'string', [
+				'notnull' => true,
+				'length' => 64,
+			]);
+			$table->addColumn('description', 'string', [
+				'notnull' => false,
+				'length' => 64,
+			]);
+			$table->addColumn('hash', 'string', [
+				'notnull' => true,
+				'length' => 64,
+			]);
+			$table->setPrimaryKey(['id']);
+			$table->addUniqueIndex(['hash', 'user_id'], 'music_ampache_users_index');
+		}
+
+		if (!$schema->hasTable('music_cache')) {
+			$table = $schema->createTable('music_cache');
+			$table->addColumn('id', 'integer', [
+				'autoincrement' => true,
+				'notnull' => true,
+				'unsigned' => true,
+			]);
+			$table->addColumn('key', 'string', [
+				'notnull' => true,
+				'length' => 64,
+			]);
+			$table->addColumn('user_id', 'string', [
+				'notnull' => true,
+				'length' => 64,
+			]);
+			$table->addColumn('data', 'text', [
+				'notnull' => false,
+			]);
+			$table->setPrimaryKey(['id']);
+			$table->addUniqueIndex(['user_id', 'key'], 'music_cache_index');
+		}
+
+		if (!$schema->hasTable('music_bookmarks')) {
+			$table = $schema->createTable('music_bookmarks');
+			$table->addColumn('id', 'integer', [
+				'autoincrement' => true,
+				'notnull' => true,
+				'unsigned' => true,
+			]);
+			$table->addColumn('user_id', 'string', [
+				'notnull' => true,
+				'length' => 64,
+			]);
+			$table->addColumn('track_id', 'integer', [
+				'notnull' => true,
+			]);
+			$table->addColumn('position', 'integer', [
+				'notnull' => true,
+			]);
+			$table->addColumn('comment', 'string', [
+				'notnull' => false,
+				'length' => 256,
+			]);
+			$table->addColumn('created', 'datetime', [
+				'notnull' => false,
+			]);
+			$table->addColumn('updated', 'datetime', [
+				'notnull' => false,
+			]);
+			$table->setPrimaryKey(['id']);
+			$table->addUniqueIndex(['user_id', 'track_id'], 'music_bookmarks_user_track');
+		}
+		return $schema;
+	}
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+	 * @param array $options
+	 */
+	public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options) {
+	}
+}