diff --git a/README.md b/README.md
index b5dfaa2399..e7808892d1 100644
--- a/README.md
+++ b/README.md
@@ -20,10 +20,10 @@
-
-
-
-
+
+
+
+
## Features
diff --git a/android/build.gradle b/android/build.gradle
index 8a8f3cd7a5..3fec02715a 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -120,7 +120,7 @@ def getVersion() {
def day = cal.get(Calendar.DAY_OF_MONTH);
def hour = cal.get(Calendar.HOUR_OF_DAY);
- // Use the current date to generate the version code:
+ // Use the last git commit date to generate the version code:
// RR_yy_MM_dd_HH
// - RR - reserved to identify special markets, max value is 21.
// - yy - year
diff --git a/android/src/fdroid/play/contact-email.txt b/android/src/fdroid/play/contact-email.txt
new file mode 100644
index 0000000000..9212f11c92
--- /dev/null
+++ b/android/src/fdroid/play/contact-email.txt
@@ -0,0 +1 @@
+googleplay@organicmaps.app
diff --git a/android/src/fdroid/play/contact-website.txt b/android/src/fdroid/play/contact-website.txt
new file mode 100644
index 0000000000..8c8dc4f575
--- /dev/null
+++ b/android/src/fdroid/play/contact-website.txt
@@ -0,0 +1 @@
+https://organicmaps.app/
diff --git a/android/src/fdroid/play/default-language.txt b/android/src/fdroid/play/default-language.txt
new file mode 100644
index 0000000000..beb9970be0
--- /dev/null
+++ b/android/src/fdroid/play/default-language.txt
@@ -0,0 +1 @@
+en-US
diff --git a/android/src/fdroid/play/listings/en-US/full-description.txt b/android/src/fdroid/play/listings/en-US/full-description.txt
new file mode 100644
index 0000000000..05be199312
--- /dev/null
+++ b/android/src/fdroid/play/listings/en-US/full-description.txt
@@ -0,0 +1,38 @@
+• Detailed offline maps with places that don't exist on other maps
+• Cycling routes, hiking trails and walking paths
+• Contour lines, elevation profiles, peaks and slopes
+• Turn-by-turn walking, cycling and car navigation with voice guidance
+• Fast offline search on the map and bookmarks
+• Dark mode to protect your eyes
+
+Organic Maps is pure and organic, made with love:
+
+• Respects your privacy
+• Saves your battery
+• No unexpected mobile data charges
+
+Organic Maps is free from trackers and other bad stuff:
+
+• No ads
+• No tracking
+• No data collection
+• No phoning home
+• No annoying registration
+• No mandatory tutorials
+• No noisy email spam
+• No push notifications
+• No crapware
+• Purely organic
+
+At Organic Maps, we believe that privacy is a fundamental human right:
+
+• Organic Maps is an indie community-driven open-source project
+• We protect privacy from Big Tech’s prying eyes
+• Stay safe no matter wherever you are
+
+Zero trackers found according to Exodus Privacy Report and only minimally required permissions are found.
+
+Please visit our GitHub page for additional details.
+
+Reject surveillance - embrace your freedom.
+Give Organic Maps a try!
diff --git a/android/src/fdroid/play/listings/en-US/graphics/icon/1.png b/android/src/fdroid/play/listings/en-US/graphics/icon/1.png
new file mode 100644
index 0000000000..cfb08eaa52
Binary files /dev/null and b/android/src/fdroid/play/listings/en-US/graphics/icon/1.png differ
diff --git a/docs/screenshots/1.jpg b/android/src/fdroid/play/listings/en-US/graphics/phone-screenshots/1.jpg
similarity index 100%
rename from docs/screenshots/1.jpg
rename to android/src/fdroid/play/listings/en-US/graphics/phone-screenshots/1.jpg
diff --git a/docs/screenshots/2.jpg b/android/src/fdroid/play/listings/en-US/graphics/phone-screenshots/2.jpg
similarity index 100%
rename from docs/screenshots/2.jpg
rename to android/src/fdroid/play/listings/en-US/graphics/phone-screenshots/2.jpg
diff --git a/docs/screenshots/3.jpg b/android/src/fdroid/play/listings/en-US/graphics/phone-screenshots/3.jpg
similarity index 100%
rename from docs/screenshots/3.jpg
rename to android/src/fdroid/play/listings/en-US/graphics/phone-screenshots/3.jpg
diff --git a/docs/screenshots/4.jpg b/android/src/fdroid/play/listings/en-US/graphics/phone-screenshots/4.jpg
similarity index 100%
rename from docs/screenshots/4.jpg
rename to android/src/fdroid/play/listings/en-US/graphics/phone-screenshots/4.jpg
diff --git a/android/src/fdroid/play/listings/en-US/short-description.txt b/android/src/fdroid/play/listings/en-US/short-description.txt
new file mode 100644
index 0000000000..fc5dd7a55a
--- /dev/null
+++ b/android/src/fdroid/play/listings/en-US/short-description.txt
@@ -0,0 +1 @@
+Fast detailed offline maps for travelers, tourists, hikers and cyclists
diff --git a/android/src/fdroid/play/listings/en-US/title.txt b/android/src/fdroid/play/listings/en-US/title.txt
new file mode 100644
index 0000000000..def2c5627a
--- /dev/null
+++ b/android/src/fdroid/play/listings/en-US/title.txt
@@ -0,0 +1 @@
+Organic Maps Offline Hike Bike Trails & Navigation
diff --git a/android/src/fdroid/play/release-notes/en-US/default.txt b/android/src/fdroid/play/release-notes/en-US/default.txt
new file mode 100644
index 0000000000..59f0338764
--- /dev/null
+++ b/android/src/fdroid/play/release-notes/en-US/default.txt
@@ -0,0 +1,14 @@
+• Updated OpenStreetMap data
+• Added Bulgarian and Brazil Portuguese translations
+• Picnic tables!
+• Fixed layout bugs, including RTL languages
+• Fixed some non-working search queries
+• Fixed wrong encoding in bookmark description
+• Fixed import of KML/KMZ files
+• Silence media volume while announcing navigation directions
+• Display and edit multiple phone numbers
+• Reduced apk size
+• Wrong regions are not offered anymore for cross-region routing
+• Improved ETA for remote roads
+• You can now route to/from private roads and areas for car navigation
+• Fixed FAQ
diff --git a/android/src/fdroid/play/version.yaml b/android/src/fdroid/play/version.yaml
new file mode 100644
index 0000000000..78756fd27b
--- /dev/null
+++ b/android/src/fdroid/play/version.yaml
@@ -0,0 +1 @@
+version: 2021.08.08-7-FDroid+21080807