diff --git a/libretro-build-common.sh b/libretro-build-common.sh
index a42bde18..c818e881 100755
--- a/libretro-build-common.sh
+++ b/libretro-build-common.sh
@@ -121,6 +121,10 @@ build_libretro_stonesoup() {
    build_libretro_generic_makefile "stonesoup" "crawl-ref" "Makefile.libretro" ${FORMAT_COMPILER_TARGET}
 }
 
+build_libretro_hatari() {
+   build_libretro_generic_makefile "hatari" "." "Makefile.libretro" ${FORMAT_COMPILER_TARGET}
+}
+
 build_libretro_prosystem() {
    build_libretro_generic_makefile "prosystem" "." "Makefile" ${FORMAT_COMPILER_TARGET}
 }
diff --git a/libretro-build.sh b/libretro-build.sh
index c1364141..097639c7 100755
--- a/libretro-build.sh
+++ b/libretro-build.sh
@@ -149,4 +149,5 @@ else
    build_libretro_3dengine
    build_libretro_ppsspp
    build_libretro_o2em
+   build_libretro_hatari
 fi
diff --git a/libretro-fetch.sh b/libretro-fetch.sh
index 299c739b..a0ed0e51 100755
--- a/libretro-fetch.sh
+++ b/libretro-fetch.sh
@@ -140,7 +140,6 @@ fetch_project_submodule "$REPO_BASE/libretro/picodrive.git" "libretro-picodrive"
 fetch_project "$REPO_BASE/libretro/tgbdual-libretro.git" "libretro-tgbdual" "libretro/tgbdual"
 fetch_project "$REPO_BASE/libretro/mupen64plus-libretro.git" "libretro-mupen64plus" "libretro/mupen64plus"
 fetch_project "$REPO_BASE/libretro/Dinothawr.git" "libretro-dinothawr" "libretro/Dinothawr"
-fetch_project "$REPO_BASE/libretro/hatari-libretro.git" "libretro-hatari" "libretro/Hatari"
 fetch_project "$REPO_BASE/libretro/libretro-uae.git" "libretro-uae" "libretro/UAE"
 fetch_project "$REPO_BASE/libretro/libretro-3dengine.git" "libretro-3dengine" "libretro/3DEngine"
 fetch_project "$REPO_BASE/libretro/libretro-remotejoy.git" "libretro-remotejoy" "libretro/RemoteJoy"
@@ -155,3 +154,4 @@ fetch_project "$REPO_BASE/libretro/libretro-o2em.git" "libretro-o2em" "libretro/
 fetch_project "$REPO_BASE/libretro/4do-libretro.git" "libretro-4do" "libretro/4do"
 fetch_project "$REPO_BASE/libretro/CATSFC-libretro.git" "libretro-catsfc" "libretro/CATSFC"
 fetch_project_submodule "$REPO_BASE/libretro/crawl-ref.git" "libretro-stonesoup" "libretro/DungeonCrawler StoneSoup"
+fetch_project "$REPO_BASE/libretro/hatari.git" "libretro-hatari" "libretro/hatari"