--- make/unix.mak.orig	2007-10-19 08:22:33.000000000 +0200
+++ make/unix.mak	2018-04-16 07:38:34.673711000 +0200
@@ -350,7 +350,7 @@
 .PHONY: all $(STANDARD_TARGETS)
 
 
-ifeq (,$(findstring $(OSTYPE),linux FreeBSD OpenBSD NetBSD solaris beos Darwin Carbon AIX Nucleus VxWorks rtems QNX cygwin mingw))
+ifeq (,$(findstring $(OSTYPE),linux BSDSUniX FreeBSD OpenBSD NetBSD solaris beos Darwin Carbon AIX Nucleus VxWorks rtems QNX cygwin mingw))
 
 default_target :
 	@echo
@@ -363,7 +363,7 @@
 	@echo
 	@echo "         Currently supported OSTYPE names are:"
 	@echo "              linux Linux linux-gnu mklinux"
-	@echo "              solaris Solaris SunOS"
+	@echo "              solaris Solaris SunOS BSDSUniX"
 	@echo "              FreeBSD OpenBSD NetBSD beos Darwin Carbon"
 	@echo "              VxWorks rtems mingw"
 	@echo
@@ -478,6 +478,23 @@
 
 ####################################################
 
+ifeq ($(OSTYPE),BSDSUniX)
+
+ifeq ($(MACHTYPE),x86)
+ifdef CPUTYPE
+STDCCFLAGS	+= -mcpu=$(CPUTYPE)
+endif
+endif
+
+P_USE_RANLIB		:= 1
+#STDCCFLAGS      += -DP_USE_PRAGMA		# migrated to configure
+
+
+endif # BSDSUniX
+
+
+####################################################
+
 ifeq ($(OSTYPE),OpenBSD)
 
 ifeq ($(MACHTYPE),x86)
@@ -882,9 +899,9 @@
 endif
 
 ifndef PTLIB_ALT
-PLATFORM_TYPE = $(OSTYPE)_$(MACHTYPE)
+PLATFORM_TYPE = 
 else
-PLATFORM_TYPE = $(OSTYPE)_$(PTLIB_ALT)_$(MACHTYPE)
+PLATFORM_TYPE = 
 endif
 
 ifndef OBJ_SUFFIX
@@ -950,15 +967,15 @@
 PW_LIBDIR	= $(PWLIBDIR)/lib
 
 # set name of the PT library
-PTLIB_BASE	= pt_$(PLATFORM_TYPE)_$(OBJ_SUFFIX)
+PTLIB_BASE	= pt_$(OBJ_SUFFIX)
 PTLIB_FILE	= lib$(PTLIB_BASE)$(LIB_TYPE).$(LIB_SUFFIX)
-PT_OBJBASE	= obj_$(PLATFORM_TYPE)_$(OBJDIR_SUFFIX)
+PT_OBJBASE	= obj_$(OBJDIR_SUFFIX)
 PT_OBJDIR	= $(PW_LIBDIR)/$(PT_OBJBASE)
 
 # set name of the PW library (may not be used)
-PWLIB_BASE	= pw_$(GUI_TYPE)_$(PLATFORM_TYPE)_$(OBJ_SUFFIX)
+PWLIB_BASE	= pw_$(GUI_TYPE)_$(OBJ_SUFFIX)
 PWLIB_FILE	= lib$(PWLIB_BASE)$(LIB_TYPE).$(LIB_SUFFIX)
-PW_OBJBASE	= obj_$(GUI_TYPE)_$(PLATFORM_TYPE)_$(OBJDIR_SUFFIX)
+PW_OBJBASE	= obj_$(GUI_TYPE)_$(OBJDIR_SUFFIX)
 PW_OBJDIR	= $(PW_LIBDIR)/$(PW_OBJBASE)
 
 ###############################################################################