diff --git a/metadata/com.duckduckgo.mobile.android.txt b/metadata/com.duckduckgo.mobile.android.txt
index dd633664fe..e4060d153e 100644
--- a/metadata/com.duckduckgo.mobile.android.txt
+++ b/metadata/com.duckduckgo.mobile.android.txt
@@ -27,6 +27,10 @@ Build:2.1.2,53
     commit=v2.1.2
     submodules=yes
 
+Build:2.1.3,54
+    commit=v2.1.3
+    submodules=yes
+
 Auto Update Mode:None
 Update Check Mode:Tags
 Current Version:2.1.3
diff --git a/metadata/org.gfd.gsmlocation.txt b/metadata/org.gfd.gsmlocation.txt
new file mode 100644
index 0000000000..5492086bfe
--- /dev/null
+++ b/metadata/org.gfd.gsmlocation.txt
@@ -0,0 +1,37 @@
+Categories:Navigation
+License:Apache2,CC-BY-SA
+Web Site:https://github.com/rtreffer/LocalGSMLocationProvider
+Source Code:https://github.com/rtreffer/LocalGSMLocationProvider
+Issue Tracker:https://github.com/rtreffer/LocalGSMLocationProvider/issues
+
+Auto Name:GSMLocationBackend
+Summary:Local OpenCellID based location provider backend for UnifiedNlp
+Description:
+[https://github.com/microg/android_packages_apps_UnifiedNlp UnifiedNlp] backend 
+that implements a cell-tower based lookup for your current location. It ships a 
+binary cell database extracted from [http://opencellid.org OpenCellID]
+This "NetworkLocationProvider" works without network connectivity and will 
+never post your data anywhere. You are thus encouraged to help OpenCellID to 
+gather more cells in order to improve this project.
+[[de.enaikoon.android.keypadmapper3]] can be used to gather cell information 
+for OpenCellID.
+.
+
+Repo Type:git
+Repo:https://github.com/rtreffer/LocalGSMLocationProvider.git
+
+Build:0.0.1.2 - alpha,12
+    commit=v0.0.1.2
+    target=android-19
+    srclibs=1:UnifiedNlpApi@v1.0.0
+
+Build:0.0.1.3,13
+    commit=v0.0.1.3
+    target=android-19
+    srclibs=1:UnifiedNlpApi@v1.0.0
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:0.0.1.3
+Current Version Code:13
+
diff --git a/metadata/org.microg.nlp.backend.apple.txt b/metadata/org.microg.nlp.backend.apple.txt
new file mode 100644
index 0000000000..02f89702c7
--- /dev/null
+++ b/metadata/org.microg.nlp.backend.apple.txt
@@ -0,0 +1,28 @@
+AntiFeatures:Tracking,NonFreeNet
+Categories:Navigation
+License:Apache2
+Web Site:https://github.com/microg/AppleWifiNlpBackend
+Source Code:https://github.com/microg/AppleWifiNlpBackend
+Issue Tracker:https://github.com/microg/AppleWifiNlpBackend/issues
+
+Summary:UnifiedNlp Backend that uses Apple's service to resolve WiFi locations
+Description:
+[https://github.com/microg/android_packages_apps_UnifiedNlp UnifiedNlp] Backend
+that uses Apple's service to resolve WiFi locations.
+Location calculation is done onboard and wifi locations are cached to minimize data usage.
+.
+
+Repo Type:git
+Repo:https://github.com/microg/AppleWifiNlpBackend.git
+
+Build:1.0.0,1000
+    commit=v1.0.0
+    target=android-19
+    srclibs=1:UnifiedNlpApi@v1.0.0,wire-runtime@wire-1.2.0,MapsAPI@v0.5
+    prebuild=cp -a $$wire-runtime$$/src/main/java/* $$MapsAPI$$/src/* src/
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.0.0
+Current Version Code:1000
+
diff --git a/srclibs/MapsAPI.txt b/srclibs/MapsAPI.txt
new file mode 100644
index 0000000000..b13964a80e
--- /dev/null
+++ b/srclibs/MapsAPI.txt
@@ -0,0 +1,4 @@
+Repo Type:git
+Repo:https://github.com/mar-v-in/MapsAPI.git
+Subdir:com.google.android.maps
+
diff --git a/srclibs/UnifiedNlpApi.txt b/srclibs/UnifiedNlpApi.txt
new file mode 100644
index 0000000000..85d4233e39
--- /dev/null
+++ b/srclibs/UnifiedNlpApi.txt
@@ -0,0 +1,4 @@
+Repo Type:git
+Repo:https://github.com/microg/android_packages_apps_UnifiedNlp.git
+Subdir:api
+Prepare:echo "android.library=true" >> project.properties
diff --git a/srclibs/wire-runtime.txt b/srclibs/wire-runtime.txt
new file mode 100644
index 0000000000..b775de38b4
--- /dev/null
+++ b/srclibs/wire-runtime.txt
@@ -0,0 +1,3 @@
+Repo Type:git
+Repo:https://github.com/square/wire.git
+Subdir:wire-runtime