diff --git a/configure.in b/configure.in
index 4f42625a9867184b7e00766ae7ad25ff16ea829f..6dd874a03af1bfa8d558189daf8a74a24562ac3b 100644
--- a/configure.in
+++ b/configure.in
@@ -56,6 +56,7 @@ PGAC_ARG_REQ(with, template, [],
 
 case $host_os in
      aix*) template=aix ;;
+    beos*) template=beos ;;
     bsdi*) template=bsdi ;;
   cygwin*) template=win ;;
     dgux*) template=dgux ;;
diff --git a/src/test/regress/pg_regress.sh b/src/test/regress/pg_regress.sh
index 80d7fee934da1eafd7c757e467e47a285a5fdbd8..a78730f7a4a16e9a67c346df88a6fc5645f67656 100644
--- a/src/test/regress/pg_regress.sh
+++ b/src/test/regress/pg_regress.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $Header: /cvsroot/pgsql/src/test/regress/Attic/pg_regress.sh,v 1.5 2000/10/03 19:37:39 petere Exp $
+# $Header: /cvsroot/pgsql/src/test/regress/Attic/pg_regress.sh,v 1.6 2000/10/07 14:55:16 momjian Exp $
 
 me=`basename $0`
 : ${TMPDIR=/tmp}
@@ -147,11 +147,11 @@ done
 
 
 # ----------
-# When on Windows or QNX, don't use Unix sockets.
+# When on Windows, QNX or BeOS, don't use Unix sockets.
 # ----------
 
 case $host_platform in
-    *-*-cygwin* | *-*-qnx*)
+    *-*-cygwin* | *-*-qnx* | *beos*)
         unix_sockets=no;;
     *)
         unix_sockets=yes;;
@@ -169,6 +169,17 @@ case $host_platform in
         DIFFFLAGS=-w;;
 esac
 
+# ----------
+# Set up the GMAKE variable correctly.
+# ----------
+
+case $host_platform in
+    *beos*)
+        GMAKE=make;;
+    *)
+        GMAKE=gmake;;
+esac
+
 
 # ----------
 # Set backend timezone and datestyle explicitly
@@ -286,7 +297,7 @@ then
 
     message "creating temporary installation"
     mkdir -p "$LOGDIR" || { (exit 2); exit; }
-    ${MAKE:-gmake} -C "$top_builddir" DESTDIR="$temp_install" install >"$LOGDIR/install.log" 2>&1
+    ${MAKE:-$GMAKE} -C "$top_builddir" DESTDIR="$temp_install" install >"$LOGDIR/install.log" 2>&1
 
     if [ $? -ne 0 ]
     then
diff --git a/src/test/regress/regress.sh b/src/test/regress/regress.sh
index c538d82c224ff25760694eeadc8d03eb83d73d5c..63deead3d5de9189e1b012a550210f6a72282e9b 100755
--- a/src/test/regress/regress.sh
+++ b/src/test/regress/regress.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Header: /cvsroot/pgsql/src/test/regress/Attic/regress.sh,v 1.54 2000/10/07 14:39:20 momjian Exp $
+# $Header: /cvsroot/pgsql/src/test/regress/Attic/regress.sh,v 1.55 2000/10/07 14:55:16 momjian Exp $
 #
 if [ $# -eq 0 ]; then
 	echo "Syntax: $0 <hostname> [extra-tests]"
@@ -11,7 +11,7 @@ shift
 extratests="$*"
 
 case $hostname in
-	i*86-pc-cygwin* | i386-*-qnx* | beos)
+        i*86-pc-cygwin* | i386-*-qnx* | *beos*)
  		HOSTLOC="-h localhost"
 		;;
  	*)