diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index ca9c7bc8aa..edaa3f94f3 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.12 1997/03/06 22:58:48 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.13 1997/03/25 07:16:30 scrappy Exp $
 #
 # NOTES
 #    Essentially all Postgres make files include this file and use the 
@@ -59,6 +59,7 @@
 #   sunos4         SUN SPARC on SunOS 4.1.3
 #   svr4           Intel x86 on Intel SVR4
 #   ultrix4        DEC MIPS on Ultrix 4.4
+#   univel         Unixware 2.0x x86
 #
 # PostgresSQL has known problems/bugs on the following platforms:
 #
@@ -598,6 +599,45 @@ DLSUFFIX= .o
 endif
 
 
+#-----------------------------------------------------------------------------
+
+#
+#	The univel port is almost guaranteed NOT to work yet.
+#
+ifeq ($(PORTNAME), univel)
+#CFLAGS+= -DHAVE_RUSAGE -DTRACEDEBUG -DASYNC_DEBUG
+CFLAGS+= -DHAVE_RUSAGE -m486 -Dsvr4
+CFLAGS_SL= -fPIC
+
+YACC= bison -y
+
+#
+#	Some of the Makefiles use LDADD, others use LD_ADD.
+#	This makes them the same.
+#
+LDADD= $(LD_ADD)
+
+# MAKE_EXPORTS is required for svr4 loaders that want a file of
+# symbol names to tell them what to export/import.
+#MAKE_EXPORTS= true
+
+#
+# Random things that must be passed everywhere to enable
+# everything to compile.  :-/
+#
+# The extra -I flag is to scoop up extra BSD-emulating headers.
+CFLAGS_BE+= -I$(SRCDIR)/backend/port/univel
+
+%.so: %.o
+	$(LD) -G -Bdynamic -o $@ $<
+
+DASH_N= ''
+BACKSLASH_C= '\\\\c'
+
+INSTALL= /usr/ucb/install
+
+endif
+
 #---------------------------------------------------------------------------
 ifeq ($(PORTNAME), nextstep)
 AROPT= rc
diff --git a/src/config.sub b/src/config.sub
index 0432524944..0859eab7b8 100755
--- a/src/config.sub
+++ b/src/config.sub
@@ -671,6 +671,9 @@ case $os in
 	-unixware* | svr4*)
 		os=-sysv4
 		;;
+	-univel*)
+		os=-sysv4
+		;;
 	-gnu/linux*)
 		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
 		;;
diff --git a/src/configure.in b/src/configure.in
index 3663b6bb4a..6a7f02867f 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -18,11 +18,16 @@ nextstep*) PORTNAME='nextstep';;
     irix*) PORTNAME='irix5';;
     hpux*) PORTNAME='hpux';;
      osf*) PORTNAME='alpha';;
+ sysv4.2*) 
+       case "$host_vendor" in
+               univel) PORTNAME='univel';;
+                    *) PORTNAME='unknown';;
+       esac ;;
 *) echo ""
    echo "*************************************************************"
    echo "configure does not currently recognize your operating system,"
    echo "therefore you must do a manual configuration of:"
-   echo ""
+   echo "$host_os"
    echo "Please contact scrappy@hub.org to see about rectifying this, "
    echo "including the above 'checking host system type...' line "
    echo "*************************************************************"
@@ -123,6 +128,7 @@ AC_CHECK_LIB(ld,       main)
 AC_CHECK_LIB(compat,   main)
 AC_CHECK_LIB(BSD,      main)
 AC_CHECK_LIB(crypt,      main)
+AC_CHECK_LIB(gen,      main)
 
 dnl Checks for header files.
 AC_HEADER_STDC