diff --git a/Makefile b/Makefile
index 9ec4f11672..43170b0725 100644
--- a/Makefile
+++ b/Makefile
@@ -37,6 +37,12 @@ ifneq ($(findstring Win32,$(OS)),)
    LDFLAGS += -static-libgcc -lwinmm
 endif
 
+ifneq ($(findstring SunOS,$(OS)),)
+   INSTALL = ginstall
+else
+   INSTALL = install
+endif
+
 include Makefile.common
 
 ifeq ($(shell $(CC) -v 2>&1 | grep -c "clang"),1)
@@ -197,13 +203,13 @@ install: $(TARGET)
 	mkdir -p $(DESTDIR)$(PREFIX)/share/applications 2>/dev/null || /bin/true
 	mkdir -p $(DESTDIR)$(MAN_DIR)/man6 2>/dev/null || /bin/true
 	mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps 2>/dev/null || /bin/true
-	install -m755 $(TARGET) $(DESTDIR)$(BIN_DIR)
-	install -m755 tools/cg2glsl.py $(DESTDIR)$(BIN_DIR)/retroarch-cg2glsl
-	install -m644 retroarch.cfg $(DESTDIR)$(GLOBAL_CONFIG_DIR)/retroarch.cfg
-	install -m644 retroarch.desktop $(DESTDIR)$(PREFIX)/share/applications
-	install -m644 docs/retroarch.6 $(DESTDIR)$(MAN_DIR)/man6
-	install -m644 docs/retroarch-cg2glsl.6 $(DESTDIR)$(MAN_DIR)/man6
-	install -m644 media/retroarch.svg $(DESTDIR)$(PREFIX)/share/pixmaps
+	$(INSTALL) -m755 $(TARGET) $(DESTDIR)$(BIN_DIR)
+	$(INSTALL) -m755 tools/cg2glsl.py $(DESTDIR)$(BIN_DIR)/retroarch-cg2glsl
+	$(INSTALL) -m644 retroarch.cfg $(DESTDIR)$(GLOBAL_CONFIG_DIR)/retroarch.cfg
+	$(INSTALL) -m644 retroarch.desktop $(DESTDIR)$(PREFIX)/share/applications
+	$(INSTALL) -m644 docs/retroarch.6 $(DESTDIR)$(MAN_DIR)/man6
+	$(INSTALL) -m644 docs/retroarch-cg2glsl.6 $(DESTDIR)$(MAN_DIR)/man6
+	$(INSTALL) -m644 media/retroarch.svg $(DESTDIR)$(PREFIX)/share/pixmaps
 	@if test -d media/assets; then \
 		echo "Installing media assets..."; \
 		mkdir -p $(DESTDIR)$(ASSETS_DIR)/retroarch/assets/xmb; \
diff --git a/libretro-common/rthreads/rthreads.c b/libretro-common/rthreads/rthreads.c
index ae52cc57a1..a49c485242 100644
--- a/libretro-common/rthreads/rthreads.c
+++ b/libretro-common/rthreads/rthreads.c
@@ -21,8 +21,10 @@
  */
 
 #ifdef __unix__
+#ifndef __sun__
 #define _POSIX_C_SOURCE 199309
 #endif
+#endif
 
 #include <stdlib.h>
 
diff --git a/qb/config.libs.sh b/qb/config.libs.sh
index 52f32a37dd..f1a994ebd5 100644
--- a/qb/config.libs.sh
+++ b/qb/config.libs.sh
@@ -22,6 +22,7 @@ PTHREADLIB=-lpthread
 SOCKETLIB=-lc
 SOCKETHEADER=
 INCLUDES='usr/include usr/local/include'
+SORT=sort
 
 if [ "$OS" = 'BSD' ]; then
    [ -d /usr/local/include ] && add_dirs INCLUDE /usr/local/include
@@ -39,6 +40,11 @@ elif [ "$OS" = 'Win32' ]; then
    DYLIB=
 elif [ "$OS" = 'Cygwin' ]; then
    die 1 'Error: Cygwin is not a supported platform. See https://bot.libretro.com/docs/compilation/windows/'
+elif [ "$OS" = 'SunOS' ]; then
+   SORT=gsort
+   # for now disabling Pulse as it breaks linking
+   # this will need to be investigated later
+   HAVE_PULSE=no
 fi
 
 add_define MAKEFILE DYLIB_LIB "$DYLIB"
@@ -514,6 +520,6 @@ while [ $# -gt 0 ]; do
    var="${tmpvar#HAVE_}"
    vars="${vars} $var"
 done
-VARS="$(printf %s "$vars" | tr ' ' '\n' | sort)"
+VARS="$(printf %s "$vars" | tr ' ' '\n' | $SORT)"
 create_config_make config.mk $(printf %s "$VARS")
 create_config_header config.h $(printf %s "$VARS")
diff --git a/qb/qb.system.sh b/qb/qb.system.sh
index 597ba350c0..22a2fb73a8 100644
--- a/qb/qb.system.sh
+++ b/qb/qb.system.sh
@@ -36,6 +36,7 @@ if [ -z "$CROSS_COMPILE" ] || [ -z "$OS" ]; then
 		'CYGWIN'*) OS='Cygwin';;
 		'Haiku') OS='Haiku';;
 		'MINGW'*) OS='Win32';;
+		'SunOS') OS='SunOS';;
 		*) OS="Win32";;
 	esac
 fi