diff --git a/config/retrodeck/retrodeck.cfg b/config/retrodeck/retrodeck.cfg
index 13a64d41..94bb59a3 100644
--- a/config/retrodeck/retrodeck.cfg
+++ b/config/retrodeck/retrodeck.cfg
@@ -5,6 +5,7 @@ rdhome=/home/deck/retrodeck
 roms_folder=/home/deck/retrodeck/roms
 saves_folder=/home/deck/retrodeck/saves
 states_folder=/home/deck/retrodeck/states
+shaders_folder=/home/deck/retrodeck/shaders
 bios_folder=/home/deck/retrodeck/bios
 backups_folder=/home/deck/retrodeck/backups
 media_folder=/home/deck/retrodeck/ES-DE/downloaded_media
diff --git a/functions/post_update.sh b/functions/post_update.sh
index 47a72469..a787327b 100644
--- a/functions/post_update.sh
+++ b/functions/post_update.sh
@@ -620,6 +620,10 @@ post_update() {
 
     # --- ALWAYS EXECUTED IN 0.9.1b ---
 
+    log i "Preparing the shaders folder for MAME..."
+    shaders_folder=$rd_home/shaders && log i "Shaders folder set to \"$shaders_folder\""
+    conf_write && log i "Done"
+
     log i "Preparing the cheats for RetroArch..."
     create_dir "$cheats_folder/retroarch"
     set_setting_value "$raconf" "cheat_database_path" "$cheats_folder/retroarch" "retroarch"
diff --git a/functions/prepare_component.sh b/functions/prepare_component.sh
index 08c62965..c9ad49cd 100644
--- a/functions/prepare_component.sh
+++ b/functions/prepare_component.sh
@@ -166,7 +166,7 @@ prepare_component() {
           create_dir -d "$cheats_folder/retroarch"
           tar --strip-components=1 -xzf /app/retrodeck/cheats/retroarch.tar.gz -C "$cheats_folder/retroarch" --overwrite
           cp -rf /app/share/libretro/shaders /var/config/retroarch/
-          dir_prep "$rdhome/shaders/retroarch" "/var/config/retroarch/shaders"
+          dir_prep "$shaders_folder/retroarch" "/var/config/retroarch/shaders"
           cp -fv $config/retroarch/retroarch.cfg /var/config/retroarch/
           cp -fv $config/retroarch/retroarch-core-options.cfg /var/config/retroarch/
           rsync -rlD --mkpath "$config/retroarch/core-overrides/" "/var/config/retroarch/config/"
@@ -276,7 +276,7 @@ prepare_component() {
       if [[ "$action" == "postmove" ]]; then # Run only post-move commands
         dir_prep "$bios_folder" "/var/config/retroarch/system"
         dir_prep "$logs_folder/retroarch" "/var/config/retroarch/logs"
-        dir_prep "$rdhome/shaders/retroarch" "/var/config/retroarch/shaders"
+        dir_prep "$shaders_folder/retroarch" "/var/config/retroarch/shaders"
         dir_prep "$texture_packs_folder/RetroArch-Mesen" "/var/config/retroarch/system/HdPacks"
         dir_prep "$texture_packs_folder/RetroArch-Mupen64Plus/cache" "/var/config/retroarch/system/Mupen64plus/cache"
         dir_prep "$texture_packs_folder/RetroArch-Mupen64Plus/hires_texture" "/var/config/retroarch/system/Mupen64plus/hires_texture"
@@ -904,6 +904,7 @@ prepare_component() {
       create_dir "/var/data/mame/assets/icons"
       create_dir "/var/data/mame/assets/covers"
       create_dir "/var/data/mame/assets/ui"
+      create_dir "$shaders_folder/mame/bgfx/"
 
       dir_prep "$saves_folder/mame-sa/hiscore" "/var/config/mame/hiscore"
       cp -fvr "$config/mame/mame.ini" "$mameconf"
@@ -917,6 +918,7 @@ prepare_component() {
       set_setting_value "$mameconf" "diff_directory" "$saves_folder/mame-sa/diff" "mame"
       set_setting_value "$mameconf" "samplepath" "$bios_folder/mame-sa/samples" "mame"
       set_setting_value "$mameconf" "cheatpath" "$cheats_folder/mame" "mame"
+      set_setting_value "$mameconf" "bgfx_path" "/app/share/mame/bgfx;$shaders_folder/mame/bgfx/" "mame"
 
       log i "Placing cheats in \"$cheats_folder/mame\""
       unzip -j -o "$config/mame/cheat0264.zip" 'cheat.7z' -d "$cheats_folder/mame"