diff --git a/metadata/org.me.tvhguide.txt b/metadata/org.me.tvhguide.txt
index 2fb39ebcaf..53a175cf2c 100644
--- a/metadata/org.me.tvhguide.txt
+++ b/metadata/org.me.tvhguide.txt
@@ -4,11 +4,15 @@ Web Site:
 Source Code:https://github.com/john-tornblom/TVHGuide
 Issue Tracker:https://github.com/john-tornblom/TVHGuide/issues
 
+Name:TVHGuide (old)
 Auto Name:TVHGuide
 Summary:TVHeadEnd PVR client
 Description:
 Watch live TV and recordings from your home theatre setup if you have a
 TVHeadEnd PVR
+
+Note: upstream developer has changed package id, new package is at
+[[org.tvheadend.tvhguide]].
 .
 
 Repo Type:git
diff --git a/metadata/org.tvheadend.tvhguide.txt b/metadata/org.tvheadend.tvhguide.txt
new file mode 100644
index 0000000000..ea41167569
--- /dev/null
+++ b/metadata/org.tvheadend.tvhguide.txt
@@ -0,0 +1,24 @@
+Categories:Multimedia
+License:GPLv3
+Web Site:
+Source Code:https://github.com/john-tornblom/TVHGuide
+Issue Tracker:https://github.com/john-tornblom/TVHGuide/issues
+
+Auto Name:TVHGuide
+Summary:TVHeadEnd PVR client
+Description:
+Watch live TV and recordings from your home theatre setup if you have a
+TVHeadEnd PVR
+.
+
+Repo Type:git
+Repo:https://github.com/john-tornblom/TVHGuide.git
+
+Build:1.6.7,21
+    commit=v1.6.7
+    target=android-9
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.6.7
+Current Version Code:21