diff --git a/share/mk/bsd.port.mk b/share/mk/bsd.port.mk
index aae6baff20e..bb2f6b6fff9 100644
--- a/share/mk/bsd.port.mk
+++ b/share/mk/bsd.port.mk
@@ -6,7 +6,7 @@
 #	bsd.port.mk - 940820 Jordan K. Hubbard.
 #	This file is in the public domain.
 #
-# $Id: bsd.port.mk,v 1.240 1996/12/18 02:27:44 asami Exp $
+# $Id: bsd.port.mk,v 1.241 1996/12/23 02:49:35 asami Exp $
 #
 # Please view me with 4 column tabs!
 
@@ -16,6 +16,8 @@
 #
 # MAINTAINER=	asami@FreeBSD.ORG
 #
+# OPENBSD_MAINTAINER=	imp@OpenBSD.ORG
+#
 
 # Supported Variables and their behaviors:
 #
@@ -23,9 +25,9 @@
 # 
 # OPSYS			- Portability clause.  This is the operating system the
 #				  makefile is being used on.  Automatically set to
-#				  "FreeBSD" or "NetBSD" as appropriate.
+#				  "FreeBSD," "NetBSD," or "OpenBSD" as appropriate.
 # PORTSDIR		- The root of the ports tree.  Defaults:
-#					FreeBSD: /usr/ports
+#					OpenBSD/FreeBSD: /usr/ports
 #					NetBSD: /usr/opt
 # DISTDIR 		- Where to get gzip'd, tarballed copies of original sources
 #				  (default: ${PORTSDIR}/distfiles).
@@ -251,6 +253,9 @@ OPSYS!=	uname -s
 .include "${.CURDIR}/../Makefile.inc"
 .endif
 
+.if (${OPSYS} == "OpenBSD")
+NOMANCOMPRESS?=yes
+.endif
 
 # These need to be absolute since we don't know how deep in the ports
 # tree we are and thus can't go relative.  They can, of course, be overridden
@@ -314,8 +319,12 @@ DO_NADA?=		/usr/bin/true
 # Miscellaneous overridable commands:
 GMAKE?=			gmake
 XMKMF?=			xmkmf -a
-.if (${OPSYS} == "NetBSD")
+.if exists(/usr/bin/md5)
 MD5?=			/usr/bin/md5
+.elif exists(/bin/md5)
+MD5?=			/bin/md5
+.elif exists(/usr/local/bin/md5)
+MD5?=			/usr/local/bin/md5
 .else
 MD5?=			/sbin/md5
 .endif
@@ -325,7 +334,11 @@ MAKE_FLAGS?=	-f
 MAKEFILE?=		Makefile
 MAKE_ENV+=		PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} MOTIFLIB="${MOTIFLIB}" CFLAGS="${CFLAGS}"
 
+.if (${OPSYS} == "OpenBSD")
+FETCH_CMD?=		/usr/bin/ftp
+.else
 FETCH_CMD?=		/usr/bin/fetch
+.endif
 
 TOUCH?=			/usr/bin/touch
 TOUCH_FLAGS?=	-f
@@ -352,7 +365,11 @@ PATCH_ARGS+=	-C
 PATCH_DIST_ARGS+=	-C
 .endif
 
+.if exists(/bin/tar)
+EXTRACT_CMD?=	/bin/tar
+.else
 EXTRACT_CMD?=	/usr/bin/tar
+.endif
 EXTRACT_SUFX?=	.tar.gz
 # Backwards compatability.
 .if defined(EXTRACT_ARGS)