diff --git a/metadata/com.anysoftkeyboard.languagepack.afrikaans.yml b/metadata/com.anysoftkeyboard.languagepack.afrikaans.yml
index 923da047d3..c423acc014 100644
--- a/metadata/com.anysoftkeyboard.languagepack.afrikaans.yml
+++ b/metadata/com.anysoftkeyboard.languagepack.afrikaans.yml
@@ -1,13 +1,15 @@
 Categories:
   - Writing
 License: Apache-2.0
-SourceCode: https://github.com/AnySoftKeyboard/LanguagePack/tree/Afrikaans
-IssueTracker: https://github.com/AnySoftKeyboard/LanguagePack/issues
+SourceCode: https://github.com/AnySoftKeyboard/AnySoftKeyboard/
+IssueTracker: https://github.com/AnySoftKeyboard/AnySoftKeyboard/issues
 Donate: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=KDYBGNUNMMN94&lc=US&item_name=AnySoftKeyboard
 
-Name: 'AnySoftKeyboard: Afrikaans'
+Name: 'AnySoftKeyboard: Afrikaans (deprecated)'
 AutoName: AnySoftKeyboard - Afrikaans Language Pack
 Description: |-
+    <b>This app has been deprecated in favor of https://f-droid.org/en/packages/com.anysoftkeyboard.languagepack.afrikaans_oss/</b>
+
     Afrikaans language pack with dictionary.
 
     The source code is in another branch to the default.
@@ -16,7 +18,7 @@ Description: |-
     layout from AnySoftKeyboard's Settings->Keyboards menu.
 
 RepoType: git
-Repo: https://github.com/AnySoftKeyboard/LanguagePack.git
+Repo: https://github.com/AnySoftKeyboard/AnySoftKeyboard.git
 
 Builds:
   - versionName: 2.0.0
@@ -32,7 +34,30 @@ Builds:
     preassemble:
       - :makeDictionary
 
+  - versionName: 4.0.1396
+    versionCode: 2908
+    commit: 1.10-r4
+    subdir: addons/languages/afrikaans_oss
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -t stretch-backports openjdk-11-jdk-headless openjdk-11-jre-headless
+      - update-alternatives --auto java
+    gradle:
+      - yes
+    output: ../../../outputs/apks/release/*
+    prebuild:
+      - echo "//gradleVersion = '6.8.3'" | tee build.gradle
+      - sed -i -e "s calculateApplicationId(project) 'com.anysoftkeyboard.languagepack.afrikaans'
+        " ../../../gradle/apk_module.gradle
+      - sed -i -e '/Data\.versionCode/ c versionCode $$VERCODE$$' -e '/Data\.versionName/
+        c versionName "$$VERSION$$"' ../../../gradle/versioning_apk.gradle
+    scanignore:
+      - addons/languages/*/pack/dictionary/*.gz
+    ndk: r14b
+
+MaintainerNotes: Package ID is now com.anysoftkeyboard.languagepack.afrikaans_oss
+
 AutoUpdateMode: None
-UpdateCheckMode: RepoManifest/Afrikaans
+UpdateCheckMode: None
 CurrentVersion: 2.0.0
 CurrentVersionCode: 100
diff --git a/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss.yml b/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss.yml
new file mode 100644
index 0000000000..b34877e193
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss.yml
@@ -0,0 +1,34 @@
+Categories:
+  - Writing
+License: Apache-2.0
+SourceCode: https://github.com/AnySoftKeyboard/AnySoftKeyboard/
+IssueTracker: https://github.com/AnySoftKeyboard/AnySoftKeyboard/issues
+Donate: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=KDYBGNUNMMN94&lc=US&item_name=AnySoftKeyboard
+
+RepoType: git
+Repo: https://github.com/AnySoftKeyboard/AnySoftKeyboard.git
+
+Builds:
+  - versionName: 4.0.1396
+    versionCode: 2908
+    commit: 1.10-r4
+    subdir: addons/languages/afrikaans_oss
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -t stretch-backports openjdk-11-jdk-headless openjdk-11-jre-headless
+      - update-alternatives --auto java
+    gradle:
+      - yes
+    output: ../../../outputs/apks/release/*
+    prebuild:
+      - echo "//gradleVersion = '6.8.3'" | tee build.gradle
+      - sed -i -e '/Data\.versionCode/ c versionCode $$VERCODE$$' -e '/Data\.versionName/
+        c versionName "$$VERSION$$"' ../../../gradle/versioning_apk.gradle
+    scanignore:
+      - addons/languages/*/pack/dictionary/*.gz
+    ndk: r14b
+
+AutoUpdateMode: None
+UpdateCheckMode: None
+CurrentVersion: 4.0.1396
+CurrentVersionCode: 2908
diff --git a/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/ar/summary.txt b/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/ar/summary.txt
new file mode 100644
index 0000000000..60ad5bd978
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/ar/summary.txt
@@ -0,0 +1 @@
+حزمة لغوية لـ AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/de/summary.txt b/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/de/summary.txt
new file mode 100644
index 0000000000..86ddfeb383
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/de/summary.txt
@@ -0,0 +1 @@
+Afrikaans für AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/el/summary.txt b/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/el/summary.txt
new file mode 100644
index 0000000000..65d7ebd2b9
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/el/summary.txt
@@ -0,0 +1 @@
+Πακέτο γλώσσας για το AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/en-US/summary.txt b/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/en-US/summary.txt
new file mode 100644
index 0000000000..d477002a1d
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/en-US/summary.txt
@@ -0,0 +1 @@
+Language pack for AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/es/summary.txt b/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/es/summary.txt
new file mode 100644
index 0000000000..bea00c4495
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/es/summary.txt
@@ -0,0 +1 @@
+Paquete de idioma africaner (sudafricano) para AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/fr/summary.txt b/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/fr/summary.txt
new file mode 100644
index 0000000000..3df9b179f0
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/fr/summary.txt
@@ -0,0 +1 @@
+Pack langue afrikaans pour AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/he/summary.txt b/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/he/summary.txt
new file mode 100644
index 0000000000..3b217ad4e0
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/he/summary.txt
@@ -0,0 +1 @@
+חבילת שפה ל־AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/is/summary.txt b/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/is/summary.txt
new file mode 100644
index 0000000000..f946f2273c
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/is/summary.txt
@@ -0,0 +1 @@
+Tungumálapakki fyrir AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/it/summary.txt b/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/it/summary.txt
new file mode 100644
index 0000000000..2ad73a8d36
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/it/summary.txt
@@ -0,0 +1 @@
+Pacchetto di lingue per AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/nb/summary.txt b/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/nb/summary.txt
new file mode 100644
index 0000000000..6d23325354
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/nb/summary.txt
@@ -0,0 +1 @@
+Språkpakke for AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/nn/summary.txt b/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/nn/summary.txt
new file mode 100644
index 0000000000..6d23325354
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/nn/summary.txt
@@ -0,0 +1 @@
+Språkpakke for AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/pl/summary.txt b/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/pl/summary.txt
new file mode 100644
index 0000000000..81076492ec
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/pl/summary.txt
@@ -0,0 +1 @@
+Pakiet językowy Afrikaans ze słownikiem dla AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/pt-BR/summary.txt b/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/pt-BR/summary.txt
new file mode 100644
index 0000000000..5e81a45dda
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/pt-BR/summary.txt
@@ -0,0 +1 @@
+Pacote de idiomas africâner para AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/pt-PT/summary.txt b/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/pt-PT/summary.txt
new file mode 100644
index 0000000000..eba9cbe0ff
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/pt-PT/summary.txt
@@ -0,0 +1 @@
+Pacote de idioma africânder para AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/pt/summary.txt b/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/pt/summary.txt
new file mode 100644
index 0000000000..eba9cbe0ff
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/pt/summary.txt
@@ -0,0 +1 @@
+Pacote de idioma africânder para AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/ro/summary.txt b/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/ro/summary.txt
new file mode 100644
index 0000000000..981a4682ca
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/ro/summary.txt
@@ -0,0 +1 @@
+Pachet de limbi pentru AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/ru/summary.txt b/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/ru/summary.txt
new file mode 100644
index 0000000000..0826b77996
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/ru/summary.txt
@@ -0,0 +1 @@
+Языковой пакет для AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/sc/summary.txt b/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/sc/summary.txt
new file mode 100644
index 0000000000..25f277fe04
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/sc/summary.txt
@@ -0,0 +1 @@
+Pachete de limba pro AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/sq/summary.txt b/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/sq/summary.txt
new file mode 100644
index 0000000000..7e9c0b57d0
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/sq/summary.txt
@@ -0,0 +1 @@
+Paketë gjuhe për AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/tr/summary.txt b/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/tr/summary.txt
new file mode 100644
index 0000000000..9f0d884e1b
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/tr/summary.txt
@@ -0,0 +1 @@
+AnySoftKeyboard için dil paketi
diff --git a/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/uk/summary.txt b/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/uk/summary.txt
new file mode 100644
index 0000000000..bdd66a88f0
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/uk/summary.txt
@@ -0,0 +1 @@
+Мовний пакет для AnySoftKeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/zh-CN/summary.txt b/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/zh-CN/summary.txt
new file mode 100644
index 0000000000..54b9947e4c
--- /dev/null
+++ b/metadata/com.anysoftkeyboard.languagepack.afrikaans_oss/zh-CN/summary.txt
@@ -0,0 +1 @@
+AnySoftKeyboard 语言包