diff --git a/libretro-build-common.sh b/libretro-build-common.sh
index 8544c5cb..61efaf7d 100644
--- a/libretro-build-common.sh
+++ b/libretro-build-common.sh
@@ -180,6 +180,21 @@ build_libretro_stella()
    fi
 }
 
+build_libretro_handy()
+{
+   cd "$BASE_DIR"
+   if [ -d "libretro-handy" ]; then
+      echo "=== Building Handy ==="
+      cd libretro-handy
+      ${MAKE} -f Makefile platform=${FORMAT_COMPILER_TARGET} $COMPILER clean
+      ${MAKE} -f Makefile platform=${FORMAT_COMPILER_TARGET} $COMPILER -j$JOBS
+
+      cp handy_libretro${FORMAT}.${FORMAT_EXT} "$RARCH_DIST_DIR"
+   else
+      echo "Handy not fetched, skipping ..."
+   fi
+}
+
 build_libretro_quicknes()
 {
    cd "$BASE_DIR"
diff --git a/libretro-build.sh b/libretro-build.sh
index 359d7bb9..46968111 100755
--- a/libretro-build.sh
+++ b/libretro-build.sh
@@ -84,14 +84,12 @@ mkdir -p "$RARCH_DIST_DIR"
 if [ $1 ]; then
    $1
 else
-if [ -z $BUILD_LIBRETRO_GL ]; then
    build_libretro_modelviewer
    build_libretro_scenewalker
    build_libretro_instancingviewer
 if [ -z $BUILD_EXPERIMENTAL ]; then
    build_libretro_mupen64
    build_libretro_ffmpeg
-fi
 fi
    build_libretro_bsnes
    build_libretro_mednafen
@@ -117,6 +115,7 @@ fi
    build_libretro_dosbox
    build_libretro_scummvm
    build_libretro_picodrive
+   build_libretro_handy
 if [ $FORMAT_COMPILER_TARGET != "win" ]; then
    build_libretro_desmume
    build_libretro_pcsx_rearmed
diff --git a/libretro-fetch.sh b/libretro-fetch.sh
index d69f401e..33e44ca1 100755
--- a/libretro-fetch.sh
+++ b/libretro-fetch.sh
@@ -80,6 +80,7 @@ fetch_project "$REPO_BASE/libretro/snes9x-next.git" "libretro-s9x-next" "libretr
 fetch_project "$REPO_BASE/libretro/Genesis-Plus-GX.git" "libretro-genplus" "libretro/Genplus GX"
 fetch_project "$REPO_BASE/libretro/fba-libretro.git" "libretro-fba" "libretro/FBA"
 fetch_project "$REPO_BASE/libretro/vba-next.git" "libretro-vba-next" "libretro/VBA"
+fetch_project "$REPO_BASE/libretro/libretro-handy.git" "libretro-handy" "libretro/Handy"
 fetch_project "$REPO_BASE/libretro/bnes-libretro.git" "libretro-bnes" "libretro/bNES"
 fetch_project "$REPO_BASE/libretro/fceu-next.git" "libretro-fceu" "libretro/FCEU"
 fetch_project "$REPO_BASE/libretro/gambatte-libretro.git" "libretro-gambatte" "libretro/Gambatte"