diff --git a/CHANGELOG.md b/CHANGELOG.md
index 526d782cd870da41a2c79fac01b84936b5db8e49..c4db8db7ddbaf8017bbf6037bb73c6d80d9c6e71 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -70,6 +70,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Add support for mp3, opus, midi, modules, wave and flac in EmulationStation
 - Bump Amiberry to v3.1.3
 - Add naomigd as a separate system
+- Share partition now created with exfat instead of ext4
 
 ## [6.1.1]
 - Add zfast shaders
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index da94491942a926fc688ad7223ba38f94450f372f..849ee781138ae21447cdf68f8bda0fc49dc29fd7 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -22,6 +22,7 @@
 - Prboom system has been renamed to Doom
 - Libretro puae emulates amigacd32 now
 - Bump Amiberry to v3.1.3
+- Share partition on fresh install is now in extfat instead of ext4
 
 ### Improvements
 - Improve internal Scraper (ScreenScraper):
diff --git a/board/recalbox/fsoverlay/etc/init.d/S11share b/board/recalbox/fsoverlay/etc/init.d/S11share
index 150b7783a9922dfe35f3a00c7e24bc4f8a98cc1f..ab57b5ce7d361576efe0f720048d2722731e533a 100755
--- a/board/recalbox/fsoverlay/etc/init.d/S11share
+++ b/board/recalbox/fsoverlay/etc/init.d/S11share
@@ -47,7 +47,7 @@ getMaxTryConfig() {
     echo 7 # default value
 }
 
-INTERNALDEVICETYPE="ext4" # faster than waiting udev to initialize to get the type
+INTERNALDEVICETYPE="exfat" # faster than waiting udev to initialize to get the type
 MAXTRY=$(getMaxTryConfig "${SHARECONFFILE}")
 NTRY=0
 
@@ -73,10 +73,7 @@ then
 	    parted -s "${PARTPREFIX}" -m unit b mkpart primary "${PSTART}" 100%
 	    if test -e "${INTERNALDEVICE}"
 	    then
-		#mkfs.vfat -F 32 -n SHARE /dev/mmcblk0p3 # if you replace this line, please change the INTERNALDEVICETYPE variable too in consequence
-		#fsck.fat /dev/mmcblk0p3 -a
-		mkfs.ext4 "${INTERNALDEVICE}" -q -F -L SHARE
-		e2fsck -f -p "${INTERNALDEVICE}"
+		mkexfatfs -n SHARE "${INTERNALDEVICE}"
 	    fi
 	fi
     fi
diff --git a/board/recalbox/fsoverlay/recalbox/scripts/recalbox-mount.sh b/board/recalbox/fsoverlay/recalbox/scripts/recalbox-mount.sh
index 849b40b9cf2584faa16602ca816842dfc6831270..a3f849edaac158923868ccbe264bf54937864a85 100755
--- a/board/recalbox/fsoverlay/recalbox/scripts/recalbox-mount.sh
+++ b/board/recalbox/fsoverlay/recalbox/scripts/recalbox-mount.sh
@@ -44,6 +44,7 @@ case "${FSTYPE}" in
 	# required for exfat
 	# note that we can't just put in /etc/modules.conf because it is loaded too late after udev and share mounting
 	modprobe fuse
+	FSMOUNTOPT="${FSMOUNTOPT},nonempty"
 	;;
 esac