diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53be087..c135ff1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.2.1.0 (versionCode 16, 2020-03-15)
+
+- Add fastlane metadata for F-Droid repository
+
 ## 2.2.0.0 (versionCode 15, 2020-02-08)
 
 - Speed up full text search by searching only in the page titles in the first step
diff --git a/app/build.gradle b/app/build.gradle
index 3c4a254..c16284a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "net.moasdawiki.app"
         minSdkVersion 26 // 26 = Oreo 8.0
         targetSdkVersion 29 // should be same as compileSdkVersion
-        versionCode 15
-        versionName "2.2.0.0"
+        versionCode 16
+        versionName "2.2.1.0"
         archivesBaseName = "moasdawiki-" + versionName + "-" + versionCode
     }
     sourceSets {
diff --git a/fastlane/metadata/android/en-US/changelogs/15.txt b/fastlane/metadata/android/en-US/changelogs/15.txt
new file mode 100644
index 0000000..682cb51
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/15.txt
@@ -0,0 +1 @@
+- Speed up full text search by searching only in the page titles in the first step
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/16.txt b/fastlane/metadata/android/en-US/changelogs/16.txt
new file mode 100644
index 0000000..d013fa9
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/16.txt
@@ -0,0 +1 @@
+- Add fastlane metadata for F-Droid repository
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt
new file mode 100644
index 0000000..a181f11
--- /dev/null
+++ b/fastlane/metadata/android/en-US/full_description.txt
@@ -0,0 +1,22 @@
+MoasdaWiki App is an extension of the MoasdaWiki Server to have a copy of your Wiki content on your mobile device.
+
+Features:
+
+- Synchronizes the data from a MoasdaWiki Server instance.
+- Data privacy: No cloud connection established, directly connects to the server inside your private network.
+- Powerful full text search, supports regular expressions.
+- Content cannot be modified within the app as it is no fun to type Wiki syntax on the mobile device, changes have to be done via the MoasdaWiki Server.
+- Calendar integration, shows birthdays and events in the mobile calendar (German version only).
+
+Synchronize content with a MoasdaWiki Server:
+
+1. Download MoasdaWiki Server from https://moasdawiki.net/.
+2. Set up a MoasdaWiki Server instance in your LAN.
+3. Install and open the MoasdaWiki App.
+4. You can see a hint that the App has to be configured first. Press on that hint.
+5. Press on "Host name" and enter the host name of the server instance, e.g. `192.168.1.101`. Press OK.
+6. In the status section below you should see "Needs authorization at server". Otherwise check host name and port again.
+7. On server side open the Wiki page in a browser, click on "Help" and "Synchronization".
+8. You can see a list of devices and synchronization sessions. Check the device name and click on "Grant".
+9. Back in the app press the back button (←) on the upper left corner to get back to the main dialog. Now you can see a hint that the app has to be synchronized. Press on that hint.
+10. Now you should have all the server content also in the app and you can see the "Home" wiki page.
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png
new file mode 100644
index 0000000..b819acb
Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png
new file mode 100644
index 0000000..26a609c
Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png
new file mode 100644
index 0000000..7577d4f
Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png
new file mode 100644
index 0000000..f54a757
Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png differ
diff --git a/fastlane/metadata/android/en-US/short_description.txt b/fastlane/metadata/android/en-US/short_description.txt
new file mode 100644
index 0000000..0bf365d
--- /dev/null
+++ b/fastlane/metadata/android/en-US/short_description.txt
@@ -0,0 +1 @@
+App to synchronize data from MoasdaWiki Server.
\ No newline at end of file