diff --git a/metadata/com.syncedsynapse.kore2.txt b/metadata/com.syncedsynapse.kore2.txt
index 2a8e670e45..8422d44018 100644
--- a/metadata/com.syncedsynapse.kore2.txt
+++ b/metadata/com.syncedsynapse.kore2.txt
@@ -5,13 +5,17 @@ Web Site:http://syncedsynapse.com/kore
 Source Code:https://github.com/SyncedSynapse/Kore
 Issue Tracker:https://github.com/SyncedSynapse/Kore/issues
 
+Name:Kore (old version)
 Auto Name:Kore
 Summary:Remote control for Kodi (XBMC)
 Description:
-Simple remote controle for [http://kodi.tv Kodi]. In-app purchases
+Simple remote control for [http://kodi.tv Kodi]. In-app purchases
 (e.g. for themes) are broken, since they require proprietary play-
 services to be installed on the device and a special API key, which
 FDroid cannot include.
+
+This app wont see any updates because upstream switched it's package
+id to [[org.xbmc.kore]].
 .
 
 Repo Type:git
@@ -41,8 +45,9 @@ Build:1.1.0,7
     gradle=yes
     prebuild=echo "IAP_KEY 'foo'" >> ../gradle.properties
 
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
+Archive Policy:0 versions
+Auto Update Mode:None
+Update Check Mode:Static
 Current Version:1.1.0
 Current Version Code:7
 
diff --git a/metadata/org.xbmc.kore.txt b/metadata/org.xbmc.kore.txt
new file mode 100644
index 0000000000..4b3d44012f
--- /dev/null
+++ b/metadata/org.xbmc.kore.txt
@@ -0,0 +1,31 @@
+Categories:Multimedia
+License:Apache2
+Web Site:http://kodi.tv
+Source Code:https://github.com/xbmc/Kore
+Issue Tracker:https://github.com/xbmc/Kore/issues
+
+Auto Name:Kore
+Summary:Remote control for Kodi (XBMC)
+Description:
+Simple remote control for [http://kodi.tv Kodi]. In-app purchases
+(e.g. for themes) are broken, since they require proprietary play-
+services to be installed on the device and a special API key, which
+FDroid cannot include.
+
+[https://github.com/xbmc/Kore/blob/HEAD/CHANGELOG.md Changelog]
+.
+
+Repo Type:git
+Repo:https://github.com/xbmc/Kore
+
+Build:1.2.1,9
+    commit=v1.2.1
+    subdir=app
+    gradle=yes
+    prebuild=echo "IAP_KEY 'foo'" >> ../gradle.properties
+
+Auto Update Mode:Version v%v
+Update Check Mode:Tags
+Current Version:1.2.1
+Current Version Code:9
+