diff --git a/README.md b/README.md
index ce7dc8ee1bbc817bede94a593234575449bb23a6..b558d6d6c2f97a14a7bede2359c677aaf5c8aa8c 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,9 @@
 
 openHAB Android application is a native client for openHAB. It uses REST API of openHAB to render sitemaps of your openHAB.
 
-<a href="https://play.google.com/store/apps/details?id=org.openhab.habdroid"><img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" height="80"></a>
+<a href="https://play.google.com/store/apps/details?id=org.openhab.habdroid"><img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" alt="Get it on Play Store" height="80"></a>
+<a href="https://f-droid.org/app/org.openhab.habdroid"><img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="80"></a>
+<a href="https://github.com/openhab/openhab-android/releases"><img src="https://raw.githubusercontent.com/openhab/openhab-android/master/assets/direct-apk-download.png" alt="Get it on GitHub" height="80"></a>
 
 ## Features
 * Control your openHAB server and [openHAB Cloud instance](https://github.com/openhab/openhab-cloud)
@@ -31,7 +33,7 @@ openHAB Android application is a native client for openHAB. It uses REST API of
 * Discover devices and add them as items
 * Supports wall mounted tablets
 
-<img src="https://raw.githubusercontent.com/openhab/openhab.android/master/fastlane/metadata/android/en-US/phoneScreenshots/main_menu.png" width="200px"> <img src="https://raw.githubusercontent.com/openhab/openhab.android/master/fastlane/metadata/android/en-US/phoneScreenshots/widget_overview.png" width="200px"> <img src="https://raw.githubusercontent.com/openhab/openhab.android/master/fastlane/metadata/android/en-US/phoneScreenshots/astro_binding.png" width="200px">
+<img src="https://raw.githubusercontent.com/openhab/openhab-android/master/fastlane/metadata/android/en-US/phoneScreenshots/main_menu.png" width="200px"> <img src="https://raw.githubusercontent.com/openhab/openhab-android/master/fastlane/metadata/android/en-US/phoneScreenshots/widget_overview.png" width="200px"> <img src="https://raw.githubusercontent.com/openhab/openhab-android/master/fastlane/metadata/android/en-US/phoneScreenshots/astro_binding.png" width="200px">
 
 ## Localization
 
@@ -55,7 +57,7 @@ If you want to contribute to Android application we are here to help you to set
 
 You are ready to contribute!
 
-Before producing any amount of code please have a look at [contribution guidelines](https://github.com/openhab/openhab.android/blob/master/CONTRIBUTING.md)
+Before producing any amount of code please have a look at [contribution guidelines](https://github.com/openhab/openhab-android/blob/master/CONTRIBUTING.md)
 
 ## Build flavors
 
diff --git a/assets/direct-apk-download.png b/assets/direct-apk-download.png
new file mode 100644
index 0000000000000000000000000000000000000000..957e94561c9cdb5bd6c506c4086f4cbcf7001373
Binary files /dev/null and b/assets/direct-apk-download.png differ
diff --git a/assets/store_descriptions/en-US/strings.sh b/assets/store_descriptions/en-US/strings.sh
index 74e5ecf9a900629b3044c3e0ed2857ad792c7bb1..7a2ccc9094f2cb747141d6d42c1b14b3f46904d4 100644
--- a/assets/store_descriptions/en-US/strings.sh
+++ b/assets/store_descriptions/en-US/strings.sh
@@ -29,3 +29,6 @@ important_note='Important note'
 oh_server='You need a openHAB server for this app'
 
 short_description='openHAB Android client'
+
+fdroid='The builds on F-Droid have GCM and crash reporting removed and will not be able to receive push notifications from openHAB Cloud.'
+beta='You can install the beta version alongside the stable version:'
diff --git a/assets/store_descriptions/full-description-fdroid.txt.template b/assets/store_descriptions/full-description-fdroid.txt.template
new file mode 100644
index 0000000000000000000000000000000000000000..9f38fef4e7243f675ef21ce858c22bf85ed02779
--- /dev/null
+++ b/assets/store_descriptions/full-description-fdroid.txt.template
@@ -0,0 +1,35 @@
+$intro
+
+$fdroid
+
+$whatis
+$rules
+
+'''$supported'''
+
+$bindings
+
+• $home_automation_solutions: Z-Wave, EnOcean, Netatmo, Homematic, Insteon, ...
+• $lighting: Philips Hue, Ikea Trådfri, LIFX, Lutron, Milight, ...
+• $heating: Max!, Nest, Vitotronic, Heatmiser, ...
+• $home_entertainment: Samsung TV, LG TV, Sonos, Pioneer AVR, Squeezebox, Kodi, Plex, ...
+• $security: ZoneMinder, DSC, ...
+• $open_protocols: HTTP, TCP/UDP, MQTT, Serial, ...
+• $special_useCases: Minecraft, Tesla Car, Weather Services, ...
+• ...
+
+'''$oss_community'''
+
+$forum
+
+$report_issues
+
+$translation
+
+'''$foundation'''
+
+$about_foundation
+
+'''$important_note'''
+
+$oh_server
diff --git a/assets/store_descriptions/full-description-fdroidbeta.txt.template b/assets/store_descriptions/full-description-fdroidbeta.txt.template
new file mode 100644
index 0000000000000000000000000000000000000000..86fa06d27f894a23de652357a67d503975693fd1
--- /dev/null
+++ b/assets/store_descriptions/full-description-fdroidbeta.txt.template
@@ -0,0 +1,37 @@
+$intro
+
+$beta [org.openhab.habdroid]
+
+$fdroid
+
+$whatis
+$rules
+
+'''$supported'''
+
+$bindings
+
+• $home_automation_solutions: Z-Wave, EnOcean, Netatmo, Homematic, Insteon, ...
+• $lighting: Philips Hue, Ikea Trådfri, LIFX, Lutron, Milight, ...
+• $heating: Max!, Nest, Vitotronic, Heatmiser, ...
+• $home_entertainment: Samsung TV, LG TV, Sonos, Pioneer AVR, Squeezebox, Kodi, Plex, ...
+• $security: ZoneMinder, DSC, ...
+• $open_protocols: HTTP, TCP/UDP, MQTT, Serial, ...
+• $special_useCases: Minecraft, Tesla Car, Weather Services, ...
+• ...
+
+'''$oss_community'''
+
+$forum
+
+$report_issues
+
+$translation
+
+'''$foundation'''
+
+$about_foundation
+
+'''$important_note'''
+
+$oh_server
diff --git a/assets/store_descriptions/generate_and_validate.sh b/assets/store_descriptions/generate_and_validate.sh
index b387d5f8bf9de17377c3aacc4ed15b60aebaca1f..28dddd63c953d7cea8c98d99012fd1e1c449e10b 100755
--- a/assets/store_descriptions/generate_and_validate.sh
+++ b/assets/store_descriptions/generate_and_validate.sh
@@ -15,6 +15,16 @@ find fastlane/metadata/android/ -name "*_description.txt" -delete
 error=0
 
 full_description_template="assets/store_descriptions/full-description.txt.template"
+if [[ "$1" == "fdroid" ]]
+then
+    echo "Using template for F-Droid"
+    full_description_template="assets/store_descriptions/full-description-fdroid.txt.template"
+elif [[ "$1" == "fdroidBeta" ]]
+then
+    echo "Using template for F-Droid Beta"
+    full_description_template="assets/store_descriptions/full-description-fdroidbeta.txt.template"
+fi
+
 store_string_base="assets/store_descriptions"
 app_string_base="mobile/src/main/res"
 resource_base="fastlane/metadata/android"
@@ -57,6 +67,8 @@ do
             -e "s|\$about_foundation|$about_foundation|" \
             -e "s|\$important_note|$important_note|" \
             -e "s|\$oh_server|$oh_server|" \
+            -e "s|\$fdroid|$fdroid|" \
+            -e "s|\$beta|$beta|" \
             "$full_description_template" > "${resource_base}/${lang}/full_description.txt"
         echo $short_description > "${resource_base}/${lang}/short_description.txt"
 
diff --git a/fastlane/metadata/android/en-US/images/featureGraphic.png b/fastlane/metadata/android/en-US/images/featureGraphic.png
index cd6346381bf2827c2a115ad6ac7a14226ad26959..403e093c27dd1f6cf608b9b08d2ef649cfb7c2c0 100644
Binary files a/fastlane/metadata/android/en-US/images/featureGraphic.png and b/fastlane/metadata/android/en-US/images/featureGraphic.png differ
diff --git a/fastlane/metadata/android/en-US/images/icon.png b/fastlane/metadata/android/en-US/images/icon.png
index 3d4d72154d5b72e9d24eb465a04178c70d1050a5..a652fabf023c1aeca71efb8aa4d143db4f6e6c8a 100644
Binary files a/fastlane/metadata/android/en-US/images/icon.png and b/fastlane/metadata/android/en-US/images/icon.png differ
diff --git a/travis/commit-version-and-metadata.sh b/travis/commit-version-and-metadata.sh
index d9bf14f54fce8d763f4c3cb327cb2f08ca1bfb5c..af9316bfaed07bab10bf7f13c8be7854eaedf2af 100755
--- a/travis/commit-version-and-metadata.sh
+++ b/travis/commit-version-and-metadata.sh
@@ -7,6 +7,13 @@ manifest="mobile/src/main/AndroidManifest.xml"
 echo "Configure git"
 git config --local user.name "openhab-bot"
 git config --local user.email "bot@openhab.org"
+echo "Check for beta version"
+if $(echo "$TRAVIS_TAG" | grep -q "beta")
+then
+    bash assets/store_descriptions/generate_and_validate.sh fdroidBeta
+else
+    bash assets/store_descriptions/generate_and_validate.sh fdroid
+fi
 echo "Git add"
 git add fastlane/*
 git add $manifest