diff --git a/libretro-build-ngc.sh b/libretro-build-ngc.sh
index 0054f267..59b5c1a6 100755
--- a/libretro-build-ngc.sh
+++ b/libretro-build-ngc.sh
@@ -256,6 +256,22 @@ build_libretro_nestopia()
    fi
 }
 
+TYRQUAKE_DIR_NAME=tyrquake
+
+build_libretro_tyrquake()
+{
+   cd $CORES_DIR
+   if [ -d "$TYRQUAKE_DIR_NAME" ]; then
+      echo "=== Building Tyr Quake ==="
+      cd $TYRQUAKE_DIR_NAME
+      make -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS clean || die "Failed to clean Tyr Quake"
+      make -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS || die "Failed to build Tyr Quake"
+      cp tyrquake_libretro$FORMAT.a $RARCH_DIST_DIR
+   else
+      echo "Tyr Quake not fetched, skipping ..."
+   fi
+}
+
 build_libretro_mednafen
 #build_libretro_s9x
 build_libretro_s9x_next
@@ -270,4 +286,4 @@ build_libretro_prboom
 #build_libretro_desmume
 #build_libretro_quicknes
 build_libretro_nestopia
-
+build_libretro_tyrquake
diff --git a/libretro-build-ps3.sh b/libretro-build-ps3.sh
index 0e5fdfc9..a5eaf367 100755
--- a/libretro-build-ps3.sh
+++ b/libretro-build-ps3.sh
@@ -5,6 +5,8 @@ ROOT_DIR=$CORES_DIR/libretro-super
 RARCH_DIR=$CORES_DIR/RetroArch
 RARCH_DIST_DIR=$RARCH_DIR/dist-scripts
 FORMAT=_ps3
+FORMAT_COMPILER_TARGET=ps3
+FORMAT_COMPILER_TARGET_ALT=sncps3
 JOBS=7
 
 die()
@@ -22,13 +24,13 @@ build_libretro_mednafen()
       echo "=== Building Mednafen ==="
       cd $MEDNAFEN_DIR_NAME
 
-      make core=pce-fast platform=sncps3 -j$JOBS clean || die "Failed to clean mednafen/${core}"
-      make core=pce-fast platform=sncps3 -j$JOBS || die "Failed to build mednafen/${core}"
+      make core=pce-fast platform=$FORMAT_COMPILER_TARGET_ALT -j$JOBS clean || die "Failed to clean mednafen/${core}"
+      make core=pce-fast platform=$FORMAT_COMPILER_TARGET_ALT -j$JOBS || die "Failed to build mednafen/${core}"
       cp mednafen_pce_fast_libretro$FORMAT.a $RARCH_DIST_DIR
       for core in wswan ngp vb
       do
-         make core=${core} platform=ps3 -j$JOBS clean || die "Failed to clean mednafen/${core}"
-         make core=${core} platform=ps3 -j$JOBS || die "Failed to build mednafen/${core}"
+         make core=${core} platform=$FORMAT_COMPILER_TARGET -j$JOBS clean || die "Failed to clean mednafen/${core}"
+         make core=${core} platform=$FORMAT_COMPILER_TARGET -j$JOBS || die "Failed to build mednafen/${core}"
          cp mednafen_$(echo ${core} | tr '[\-]' '[_]')_libretro$FORMAT.a $RARCH_DIST_DIR
       done
       cd ..
@@ -58,8 +60,8 @@ build_libretro_s9x_next()
    if [ -d "$S9X_NEXT_DIR_NAME" ]; then
       echo "=== Building SNES9x-Next ==="
       cd $S9X_NEXT_DIR_NAME
-      make -f Makefile.libretro platform=sncps3 -j$JOBS clean || die "Failed to build SNES9x-Next"
-      make -f Makefile.libretro platform=sncps3 -j$JOBS || die "Failed to build SNES9x-Next"
+      make -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET_ALT -j$JOBS clean || die "Failed to build SNES9x-Next"
+      make -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET_ALT -j$JOBS || die "Failed to build SNES9x-Next"
       cp snes9x_next_libretro$FORMAT.a $RARCH_DIST_DIR
       cd ..
    else
@@ -75,8 +77,8 @@ build_libretro_genplus()
    if [ -d "$GENPLUS_DIR_NAME" ]; then
       echo "=== Building Genplus GX ==="
       cd $GENPLUS_DIR_NAME
-      make -f Makefile.libretro platform=ps3 -j$JOBS clean || die "Failed to clean Genplus GX"
-      make -f Makefile.libretro platform=ps3 -j$JOBS || die "Failed to build Genplus GX"
+      make -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS clean || die "Failed to clean Genplus GX"
+      make -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS || die "Failed to build Genplus GX"
       cp genesis_plus_gx_libretro$FORMAT.a $RARCH_DIST_DIR
    else
       echo "Genplus GX not fetched, skipping ..."
@@ -91,8 +93,8 @@ build_libretro_fba()
    if [ -d "$FBA_DIR_NAME" ]; then
       echo "=== Building Final Burn Alpha ==="
       cd $FBA_DIR_NAME/svn-current/trunk
-      make -f makefile.libretro platform=ps3 -j$JOBS clean || die "Failed to clean Final Burn Alpha"
-      make -f makefile.libretro platform=ps3 -j$JOBS || die "Failed to build Final Burn Alpha"
+      make -f makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS clean || die "Failed to clean Final Burn Alpha"
+      make -f makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS || die "Failed to build Final Burn Alpha"
       cp fb_alpha_libretro$FORMAT.a $RARCH_DIST_DIR
    else
       echo "Final Burn Alpha not fetched, skipping ..."
@@ -107,8 +109,8 @@ build_libretro_vba()
    if [ -d "$VBA_NEXT_DIR_NAME" ]; then
       echo "=== Building VBA-Next ==="
       cd $VBA_NEXT_DIR_NAME
-      make -f Makefile.libretro platform=sncps3 -j$JOBS clean || die "Failed to clean VBA-Next"
-      make -f Makefile.libretro platform=sncps3 -j$JOBS || die "Failed to build VBA-Next"
+      make -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET_ALT -j$JOBS clean || die "Failed to clean VBA-Next"
+      make -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET_ALT -j$JOBS || die "Failed to build VBA-Next"
       cp vba_next_libretro$FORMAT.a $RARCH_DIST_DIR
    else
       echo "VBA-Next not fetched, skipping ..."
@@ -123,8 +125,8 @@ build_libretro_fceu()
    if [ -d "$FCEUMM_DIR_NAME" ]; then
       echo "=== Building FCEU ==="
       cd $FCEUMM_DIR_NAME
-      make -C fceumm-code -f Makefile.libretro platform=ps3 -j$JOBS clean || die "Failed to clean FCEUmm"
-      make -C fceumm-code -f Makefile.libretro platform=ps3 -j$JOBS || die "Failed to build FCEUmm"
+      make -C fceumm-code -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS clean || die "Failed to clean FCEUmm"
+      make -C fceumm-code -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS || die "Failed to build FCEUmm"
       cp fceumm-code/fceumm_libretro$FORMAT.a $RARCH_DIST_DIR
    else
       echo "FCEU not fetched, skipping ..."
@@ -139,8 +141,8 @@ build_libretro_gambatte()
    if [ -d "$GAMBATTE_DIR_NAME" ]; then
       echo "=== Building Gambatte ==="
       cd $GAMBATTE_DIR_NAME/libgambatte
-      make -f Makefile.libretro platform=sncps3 -j$JOBS clean || die "Failed to clean Gambatte"
-      make -f Makefile.libretro platform=sncps3 -j$JOBS || die "Failed to build Gambatte"
+      make -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET_ALT -j$JOBS clean || die "Failed to clean Gambatte"
+      make -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET_ALT -j$JOBS || die "Failed to build Gambatte"
       cp gambatte_libretro$FORMAT.a $RARCH_DIST_DIR
    else
       echo "Gambatte not fetched, skipping ..."
@@ -155,8 +157,8 @@ build_libretro_nx()
    if [ -d "$NXENGINE_DIR_NAME" ]; then
       echo "=== Building NXEngine ==="
       cd $NXENGINE_DIR_NAME
-      make platform=ps3 -j$JOBS clean || die "Failed to clean NXEngine"
-      make platform=ps3 -j$JOBS || die "Failed to build NXEngine"
+      make platform=$FORMAT_COMPILER_TARGET -j$JOBS clean || die "Failed to clean NXEngine"
+      make platform=$FORMAT_COMPILER_TARGET -j$JOBS || die "Failed to build NXEngine"
       cp nxengine_libretro$FORMAT.a $RARCH_DIST_DIR
    else
       echo "NXEngine not fetched, skipping ..."
@@ -171,8 +173,8 @@ build_libretro_prboom()
    if [ -d "$PRBOOM_DIR_NAME" ]; then
       echo "=== Building PRBoom ==="
       cd $PRBOOM_DIR_NAME
-      make platform=sncps3 -j$JOBS clean || die "Failed to clean PRBoom"
-      make platform=sncps3 -j$JOBS || die "Failed to build PRBoom"
+      make platform=$FORMAT_COMPILER_TARGET_ALT -j$JOBS clean || die "Failed to clean PRBoom"
+      make platform=$FORMAT_COMPILER_TARGET_ALT -j$JOBS || die "Failed to build PRBoom"
       cp prboom_libretro$FORMAT.a $RARCH_DIST_DIR
    else
       echo "PRBoom not fetched, skipping ..."
@@ -227,14 +229,30 @@ build_libretro_nestopia()
    if [ -d "$NESTOPIA_DIR_NAME" ]; then
       echo "=== Building Nestopia ==="
       cd $NESTOPIA_DIR_NAME/libretro
-      make platform=ps3 -j$JOBS clean || die "Failed to clean Nestopia"
-      make platform=ps3 -j$JOBS || die "Failed to build Nestopia"
+      make platform=$FORMAT_COMPILER_TARGET -j$JOBS clean || die "Failed to clean Nestopia"
+      make platform=$FORMAT_COMPILER_TARGET -j$JOBS || die "Failed to build Nestopia"
       cp nestopia_libretro$FORMAT.a $RARCH_DIST_DIR
    else
       echo "Nestopia not fetched, skipping ..."
    fi
 }
 
+TYRQUAKE_DIR_NAME=tyrquake
+
+build_libretro_tyrquake()
+{
+   cd $CORES_DIR
+   if [ -d "$TYRQUAKE_DIR_NAME" ]; then
+      echo "=== Building Tyr Quake ==="
+      cd $TYRQUAKE_DIR_NAME
+      make -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS clean || die "Failed to clean Tyr Quake"
+      make -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS || die "Failed to build Tyr Quake"
+      cp tyrquake_libretro$FORMAT.a $RARCH_DIST_DIR
+   else
+      echo "Tyr Quake not fetched, skipping ..."
+   fi
+}
+
 build_libretro_mednafen
 #build_libretro_s9x
 build_libretro_s9x_next
@@ -249,4 +267,5 @@ build_libretro_prboom
 #build_libretro_desmume
 #build_libretro_quicknes
 build_libretro_nestopia
+build_libretro_tyrquake
 
diff --git a/libretro-build-wii.sh b/libretro-build-wii.sh
index 2069db33..9b7e7b54 100755
--- a/libretro-build-wii.sh
+++ b/libretro-build-wii.sh
@@ -256,6 +256,22 @@ build_libretro_nestopia()
    fi
 }
 
+TYRQUAKE_DIR_NAME=tyrquake
+
+build_libretro_tyrquake()
+{
+   cd $CORES_DIR
+   if [ -d "$TYRQUAKE_DIR_NAME" ]; then
+      echo "=== Building Tyr Quake ==="
+      cd $TYRQUAKE_DIR_NAME
+      make -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS clean || die "Failed to clean Tyr Quake"
+      make -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS || die "Failed to build Tyr Quake"
+      cp tyrquake_libretro$FORMAT.a $RARCH_DIST_DIR
+   else
+      echo "Tyr Quake not fetched, skipping ..."
+   fi
+}
+
 build_libretro_mednafen
 #build_libretro_s9x
 build_libretro_s9x_next
@@ -270,4 +286,4 @@ build_libretro_prboom
 #build_libretro_desmume
 #build_libretro_quicknes
 build_libretro_nestopia
-
+build_libretro_tyrquake
diff --git a/libretro-build.sh b/libretro-build.sh
index 2e315303..72a1f3b3 100755
--- a/libretro-build.sh
+++ b/libretro-build.sh
@@ -258,6 +258,19 @@ build_libretro_nestopia()
    fi
 }
 
+build_libretro_tyrquake()
+{
+   if [ -d "libretro-tyrquake" ]; then
+      echo "=== Building Tyr Quake ==="
+      cd libretro-tyrquake
+      make -f Makefile.libretro -j4 || die "Failed to build Tyr Quake"
+      cp tyrquake_libretro.so ../libretro-tyrquake.so
+      cd ../..
+   else
+      echo "Tyr Quake not fetched, skipping ..."
+   fi
+}
+
 build_libretro_bsnes
 build_libretro_mednafen
 build_libretro_s9x
@@ -275,4 +288,5 @@ build_libretro_stella
 build_libretro_desmume
 build_libretro_quicknes
 build_libretro_nestopia
+build_libretro_tyrquake
 
diff --git a/libretro-fetch.sh b/libretro-fetch.sh
index e63411cf..f1ce2b5b 100755
--- a/libretro-fetch.sh
+++ b/libretro-fetch.sh
@@ -94,5 +94,6 @@ fetch_project "$REPO_BASE/libretro/stella-libretro.git" "libretro-stella" "libre
 fetch_project "$REPO_BASE/libretro/desmume-libretro.git" "libretro-desmume" "libretro/Desmume"
 fetch_project "$REPO_BASE/libretro/QuickNES_Core.git" "libretro-quicknes" "libretro/QuickNES"
 fetch_project "$REPO_BASE/libretro/nestopia.git" "libretro-nestopia" "libretro/Nestopia"
+fetch_project "$REPO_BASE/libretro/tyrquake.git" "libretro-tyrquake" "libretro/tyrquake"
 fetch_project_mednafen "$REPO_BASE/libretro/mednafen-libretro.git" "libretro-mednafen" "libretro/Mednafen"
 
diff --git a/libretro-install-win32.sh b/libretro-install-win32.sh
index 49737f46..081d2dfa 100755
--- a/libretro-install-win32.sh
+++ b/libretro-install-win32.sh
@@ -31,6 +31,10 @@ LIBS="$LIBS libretro-mednafen/libretro-0926-mednafen-psx.dll"
 LIBS="$LIBS libretro-mednafen/libretro-0924-mednafen-pce-fast.dll"
 LIBS="$LIBS libretro-mednafen/libretro-0922-mednafen-wswan.dll"
 LIBS="$LIBS libretro-quicknes/libretro-git-quicknes.dll"
+
+#note -not sure about what kind of versioning you're doing here - so just going to make an assumption
+LIBS="$LIBS libretro-tyrquake/libretro-git-tyrquake.dll"
+
 LIBS="$LIBS libretro-nestopia/libretro-144-nestopia.dll"
 
 for lib in $LIBS
diff --git a/libretro-install.sh b/libretro-install.sh
index cd150613..402cca4e 100755
--- a/libretro-install.sh
+++ b/libretro-install.sh
@@ -30,6 +30,7 @@ LIBS="$LIBS libretro-desmume/libretro-desmume.so"
 LIBS="$LIBS libretro-mednafen/libretro-mednafen-psx.so"
 LIBS="$LIBS libretro-mednafen/libretro-mednafen-pce-fast.so"
 LIBS="$LIBS libretro-mednafen/libretro-mednafen-wswan.so"
+LIBS="$LIBS libretro-mednafen/libretro-tyrquake.so"
 LIBS="$LIBS libretro-quicknes/libretro-quicknes.so"
 LIBS="$LIBS libretro-nestopia/libretro-nestopia.so"