diff --git a/metadata/com.danga.squeezer.txt b/metadata/com.danga.squeezer.txt
deleted file mode 100644
index ef1310b369..0000000000
--- a/metadata/com.danga.squeezer.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-Category:Multimedia
-License:Apache2
-Web Site:http://code.google.com/p/android-squeezer/
-Source Code:https://github.com/bradfitz/android-squeezer
-Issue Tracker:http://code.google.com/p/android-squeezer/issues/list
-
-Summary:Squeezebox remote control app
-Description:
-Control your SqueezeCenter ("Slimserver") and Squeezebox (or multiple
-squeezeboxes) from your Android phone.
-.
-
-Repo Type:git
-Repo:https://github.com/bradfitz/android-squeezer.git
-
-Build Version:0.5,5,df0ffda7ae6370f22847ea9e764d81802eeaf545,\
-prebuild=sed -r -i \
- 's/(android:)min(SdkVersion)(="[^"]")/\1min\2\3 \1target\2="4"/' \
- AndroidManifest.xml,\
-oldsdkloc=yes,target=android-4
-
-Update Check Mode:None
-Current Version:0.5
-Current Version Code:5
-
diff --git a/metadata/uk.org.ngo.squeezer.txt b/metadata/uk.org.ngo.squeezer.txt
new file mode 100644
index 0000000000..2a7f07e80b
--- /dev/null
+++ b/metadata/uk.org.ngo.squeezer.txt
@@ -0,0 +1,38 @@
+Category:Multimedia
+License:Apache2
+Web Site:http://code.google.com/p/android-squeezer/
+Source Code:https://github.com/nikclayton/android-squeezer
+Issue Tracker:http://code.google.com/p/android-squeezer/issues/list
+
+Summary:Squeezebox remote control app
+Description:
+Control your SqueezeCenter ("Slimserver") and Squeezebox (or multiple
+squeezeboxes) from your Android gadget.
+
+* Now playing, artwork, seeking within tracks, volume control
+* Browse the library by artist, album, song title, genre, year, or playlist
+* Browse the music folders (if supported by the server)
+* Full library search
+* Internet radio support (browse, staff picks, search)
+* Scan the local network for compatible Squeezeservers
+
+The Google Analytics library was replaced with a dummy library, so
+no usage statistics will be sent even though there is a switch
+enabled in the Preferences.
+.
+
+Repo Type:git
+Repo:https://github.com/nikclayton/android-squeezer.git
+
+Build Version:0.5,5,df0ffda7ae6370f22847ea9e764d81802eeaf545,\
+prebuild=sed -r -i \
+ 's/(android:)min(SdkVersion)(="[^"]")/\1min\2\3 \1target\2="4"/' \
+ AndroidManifest.xml,\
+oldsdkloc=yes,target=android-4
+Build Version:0.9,12,0.9,rm=libs/libGoogleAnalytics.jar,srclibs=NoAnalytics@158a4a,prebuild=\
+echo "android.library.reference.1=$$NoAnalytics$$" >> project.properties && rm -rf market
+
+Update Check Mode:Tags
+Current Version:0.9
+Current Version Code:12
+