diff --git a/mozilla/config/OpenBSD.mk b/mozilla/config/OpenBSD.mk
new file mode 100644
index 00000000000..77a0c95f567
--- /dev/null
+++ b/mozilla/config/OpenBSD.mk
@@ -0,0 +1,100 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+######################################################################
+# Config stuff for OpenBSD
+######################################################################
+#
+######################################################################
+# Version-independent
+######################################################################
+
+ARCH			:= openbsd
+ifeq (86,$(findstring 86,$(OS_TEST)))
+CPU_ARCH		:= x86
+else
+CPU_ARCH		:= $(OS_TEST)
+endif
+GFX_ARCH		:= x
+
+OS_INCLUDES		= -I/usr/X11R6/include
+G++INCLUDES		= -I/usr/include/g++
+LOC_LIB_DIR		=
+MOTIF			=
+MOTIFLIB		=
+OS_LIBS			=
+
+OS_MINOR		= $(shell echo $(OS_RELEASE) | cut -f2 -d.)
+
+PLATFORM_FLAGS		= -DOPENBSD $(DSO_CFLAGS)
+MOVEMAIL_FLAGS		= -DHAVE_STRERROR
+PORT_FLAGS		= -DSW_THREADS -DNEED_UINT -DHAVE_LCHOWN -DNTOHL_ENDIAN_H -DHAVE_FILIO_H -DNEED_SYS_TIME_H -DNEED_UINT_T -DHAVE_BSD_FLOCK
+PDJAVA_FLAGS		= -mx128m
+OS_GPROF_FLAGS		= -pg
+LD_FLAGS		= -L/usr/X11R6/lib -lXm
+
+OS_CFLAGS		= $(PLATFORM_FLAGS) $(PORT_FLAGS) $(MOVEMAIL_FLAGS)
+
+LOCALE_MAP		= $(DEPTH)/cmd/xfe/intl/bsd386.lm
+EN_LOCALE		= C
+DE_LOCALE		= de_DE.ISO8859-1
+FR_LOCALE		= fr_FR.ISO8859-1
+JP_LOCALE		= ja
+SJIS_LOCALE		= ja_JP.SJIS
+KR_LOCALE		= ko_KR.EUC
+CN_LOCALE		= zh
+TW_LOCALE		= zh
+I2_LOCALE		= i2
+
+######################################################################
+# Version-specific stuff
+######################################################################
+
+######################################################################
+# Overrides for defaults in config.mk (or wherever)
+######################################################################
+
+DLL_SUFFIX		= so.1.0
+EMACS			= /usr/bin/true
+JAVA_PROG		= $(JAVA_BIN)java
+RANLIB			= /usr/bin/ranlib
+
+######################################################################
+# Other
+######################################################################
+
+ifeq ($(USE_PTHREADS),1)
+OS_LIBS			= -lc_r
+else
+OS_LIBS			= -lc
+PORT_FLAGS		+= -D_PR_LOCAL_THREADS_ONLY
+endif
+
+BUILD_UNIX_PLUGINS	= 1
+
+MKSHLIB			= $(LD) $(DSO_LDOPTS)
+
+DSO_CFLAGS		= -fPIC
+DSO_LDFLAGS		= 
+
+# not all arch's support shared libs
+#
+ifneq (,$(filter alpha mips pmax,$(CPU_ARCH)))
+DSO_LDOPTS		= -shared
+else
+DSO_LDOPTS		= -Bshareable
+endif
diff --git a/mozilla/config/config.mk b/mozilla/config/config.mk
index 8ad854581d2..eccd838adde 100644
--- a/mozilla/config/config.mk
+++ b/mozilla/config/config.mk
@@ -89,7 +89,7 @@ endif
 # but save the version to allow multiple versions of the same base
 # platform to be built in the same tree.
 #
-ifneq (,$(filter FreeBSD HP-UX IRIX Linux NetBSD OSF1 SunOS,$(OS_ARCH)))
+ifneq (,$(filter FreeBSD HP-UX IRIX Linux NetBSD OpenBSD OSF1 SunOS,$(OS_ARCH)))
 OS_VERS		:= $(suffix $(OS_RELEASE))
 OS_RELEASE	:= $(basename $(OS_RELEASE))
 
diff --git a/mozilla/config/rules.mk b/mozilla/config/rules.mk
index f2b27108b00..3f8e1d69b7c 100644
--- a/mozilla/config/rules.mk
+++ b/mozilla/config/rules.mk
@@ -112,7 +112,7 @@ else
 ifeq ($(OS_ARCH),HP-UX)
 SHARED_LIBRARY		:= $(LIBRARY:.a=.sl)
 else
-ifneq (,$(filter FreeBSD NetBSD,$(OS_ARCH)))
+ifneq (,$(filter FreeBSD NetBSD OpenBSD,$(OS_ARCH)))
 SHARED_LIBRARY		:= $(LIBRARY:.a=.so.1.0)
 else
 ifeq ($(OS_ARCH)$(OS_RELEASE),SunOS4.1)