diff --git a/ChangeLog.md b/ChangeLog.md
index ba011b6..a1f54f9 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -12,10 +12,14 @@
 * CommonInstaller
   * Full, microG packages
      * improve GApps removal mechanism
+     * improve some installer messages
+     * new value 3 for nanodroid_play variable will install Fake Store only
 * Full, microG packages
   * move microG GsfProxy from /system/priv-app to /system/app
 * Full package
   * download Orbot and Orfox from Guardian Project F-Droid repo instead from the release mirror
+* SetupWizard
+  * update for nanodroid_play value 3
 
 ### Updates
 
diff --git a/CommonInstaller b/CommonInstaller
index d6b6271..5c5045f 100644
--- a/CommonInstaller
+++ b/CommonInstaller
@@ -702,15 +702,27 @@ install_apps () {
 
 install_store () {
 	# install Yalp Store or Play Store whichever requested
-	if [ "${nanodroid_play}" -eq 1 ]; then
-		ui_print " << with Play Store"
-		nanodroid_install_apk Phonesky
-	elif [ "${nanodroid_play}" -eq 2 ]; then
-		ui_print " << with Yalp Store (and Fake Store)"
-		nanodroid_install_apk YalpStore
-		nanodroid_install_apk FakeStore
-	else	ui_print " << without App Store"
-	fi
+	case "${nanodroid_play}" in
+		0 )
+			ui_print " << without App Store"
+		;;
+
+		1 )
+			ui_print " << with Play Store"
+			nanodroid_install_apk Phonesky
+		;;
+
+		2 )
+			ui_print " << with Yalp Store (and Fake Store)"
+			nanodroid_install_apk YalpStore
+			nanodroid_install_apk FakeStore
+		;;
+
+		3 )
+			ui_print " << with Fake Store"
+			nanodroid_install_apk FakeStore
+		;;
+	esac
 }
 
 install_zelda () {
@@ -724,7 +736,7 @@ install_zelda () {
 
 install_bash () {
 	if [ "${nanodroid_bash}" -eq 1 ]; then
-		ui_print " << GNU Bash Shell"
+		ui_print " << with GNU Bash Shell"
 		nanodroid_install_file etc/bash_logout
 		nanodroid_install_file etc/bashrc
 
@@ -738,7 +750,7 @@ install_bash () {
 }
 
 install_nanodroidscripts () {
-	ui_print " << NanoDroid Scripts"
+	ui_print " << with NanoDroid Scripts"
 
 	for script in npem nupd nutl \
 		nanodroid-perm nanodroid-upd \
@@ -759,7 +771,7 @@ install_nanodroidscripts () {
 
 install_fonts () {
 	if [ "${nanodroid_fonts}" -eq 1 ]; then
-		ui_print " << Nintendo Fonts"
+		ui_print " << with Nintendo Fonts"
 		nanodroid_install_file xbin/nanodroid-font bin
 		nanodroid_substitute xbin/nanodroid-font
 		nanodroid_install_file xbin/nfnt bin
@@ -770,7 +782,7 @@ install_fonts () {
 
 install_nano () {
 	if [ "${nanodroid_nano}" -eq 1 ]; then
-		ui_print " << GNU Nano Terminal Editor"
+		ui_print " << with GNU Nano Terminal Editor"
 		nanodroid_install_dir etc/terminfo
 
 		nanodroid_install_file xbin/nano bin
@@ -781,7 +793,7 @@ install_nano () {
 
 install_shell_utils () {
 	if [ "${nanodroid_utils}" -eq 1 ]; then
-		ui_print " << Shell Utilities"
+		ui_print " << with Shell Utilities"
 
 		# architecture dependend stuff
 		for binary in col colcrt colrm findfs findmnt hexdump \
diff --git a/doc/AlterInstallation.md b/doc/AlterInstallation.md
index 2694529..951bec3 100644
--- a/doc/AlterInstallation.md
+++ b/doc/AlterInstallation.md
@@ -76,6 +76,7 @@ what app store to use:
 * `0` will not provide any app store
 * `1` will provide **Play Store**
 * `2` will provide **Yalp Store** and **Fake Store**
+* `3` will provide **Fake Store** only
 
 `nanodroid_overlay=[0|1]`
 
diff --git a/setup-wizard/META-INF/com/google/android/aroma-config b/setup-wizard/META-INF/com/google/android/aroma-config
index 72b9f58..393087f 100644
--- a/setup-wizard/META-INF/com/google/android/aroma-config
+++ b/setup-wizard/META-INF/com/google/android/aroma-config
@@ -85,7 +85,8 @@ selectbox(
 	"Select the Google App Store you want", "", 2, #-- Group 1. key = "selected.1"
 	"None",		"Install no Google App Store",			0,	#-- selected.1 = 1
 	"Play Store",	"Install official Play Store",			1,	#-- selected.1 = 2
-	"Yalp Store",	"Install unofficial Yalp Store (+ Fake Store)",	0	#-- selected.1 = 3
+	"Yalp Store",	"Install unofficial Yalp Store (+ Fake Store)",	0,	#-- selected.1 = 3
+	"Fake Store",	"Install Fake Store only",			0	#-- selected.1 = 4
 );
 
 selectbox(
diff --git a/setup-wizard/nanodroid-setup b/setup-wizard/nanodroid-setup
index 651a527..3692cae 100644
--- a/setup-wizard/nanodroid-setup
+++ b/setup-wizard/nanodroid-setup
@@ -106,6 +106,9 @@ elif grep -q "selected.1=2" "${store_prop}"; then
 elif grep -q "selected.1=3" "${store_prop}"; then
 	ui_print "  <>> setting property: nanodroid_play [Yalp Store]"
 	echo "nanodroid_play=2" >> "${nanodroid_setup}"
+elif grep -q "selected.1=4" "${store_prop}"; then
+	ui_print "  <>> setting property: nanodroid_play [Fake Store]"
+	echo "nanodroid_play=3" >> "${nanodroid_setup}"
 fi
 
 if grep -q "selected.1=1" "${nlp_prop}"; then