diff --git a/build-support/factor.sh b/build-support/factor.sh
index ea0c35aa83..4bcd9e3086 100755
--- a/build-support/factor.sh
+++ b/build-support/factor.sh
@@ -89,6 +89,11 @@ set_md5sum() {
 set_gcc() {
     case $OS in
         openbsd) ensure_program_installed egcc; CC=egcc;;
+	netbsd) if [[ $WORD -eq 64 ]] ; then
+			CC=/usr/pkg/gcc34/bin/gcc
+		else
+			CC=gcc
+		fi ;;
         *) CC=gcc;;
     esac
 }
@@ -185,6 +190,7 @@ find_architecture() {
        i386) ARCH=x86;;
        i686) ARCH=x86;;
        amd64) ARCH=x86;;
+       ppc64) ARCH=ppc;;
        *86) ARCH=x86;;
        *86_64) ARCH=x86;;
        "Power Macintosh") ARCH=ppc;;
diff --git a/vm/os-linux-ppc.h b/vm/os-linux-ppc.h
index 86f0509e38..eb28af53e4 100644
--- a/vm/os-linux-ppc.h
+++ b/vm/os-linux-ppc.h
@@ -1,4 +1,12 @@
+#include <ucontext.h>
+
 #define FRAME_RETURN_ADDRESS(frame) *((XT *)(frame_successor(frame) + 1) + 1)
 
+INLINE void *ucontext_stack_pointer(void *uap)
+{
+        ucontext_t *ucontext = (ucontext_t *)uap;
+        return (void *)ucontext->uc_mcontext.uc_regs->gregs[PT_R1];
+}
+
 #define UAP_PROGRAM_COUNTER(ucontext) \
 	(((ucontext_t *)(ucontext))->uc_mcontext.uc_regs->gregs[PT_NIP])
diff --git a/vm/os-macosx.h b/vm/os-macosx.h
index 4c35087752..701bb8da01 100644
--- a/vm/os-macosx.h
+++ b/vm/os-macosx.h
@@ -15,4 +15,10 @@ DLLEXPORT void c_to_factor_toplevel(CELL quot);
 #ifndef environ
 	extern char ***_NSGetEnviron(void);
 	#define environ (*_NSGetEnviron())
-#endif
\ No newline at end of file
+#endif
+
+INLINE void *ucontext_stack_pointer(void *uap)
+{
+	ucontext_t *ucontext = (ucontext_t *)uap;
+	return ucontext->uc_stack.ss_sp;
+}
diff --git a/vm/os-unix-ucontext.h b/vm/os-unix-ucontext.h
deleted file mode 100644
index 9ed0620a83..0000000000
--- a/vm/os-unix-ucontext.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <ucontext.h>
-
-INLINE void *ucontext_stack_pointer(void *uap)
-{
-	ucontext_t *ucontext = (ucontext_t *)uap;
-	return ucontext->uc_stack.ss_sp;
-}
diff --git a/vm/platform.h b/vm/platform.h
index a8c8ba756f..2f97cb9d1d 100644
--- a/vm/platform.h
+++ b/vm/platform.h
@@ -27,7 +27,6 @@
 	#include "os-unix.h"
 
 	#ifdef __APPLE__
-		#include "os-unix-ucontext.h"
 		#include "os-macosx.h"
 		#include "mach_signal.h"
 		
@@ -84,7 +83,6 @@
 			#if defined(FACTOR_X86)
 				#include "os-linux-x86.32.h"
 			#elif defined(FACTOR_PPC)
-				#include "os-unix-ucontext.h"
 				#include "os-linux-ppc.h"
 			#elif defined(FACTOR_ARM)
 				#include "os-linux-arm.h"