diff --git a/DOCS/documentation.html b/DOCS/documentation.html
index 91a0683d3b..943bbac7da 100644
--- a/DOCS/documentation.html
+++ b/DOCS/documentation.html
@@ -242,6 +242,7 @@
       <LI><A HREF="#6.4">6.4 StrongARM</A></LI>
       <LI><A HREF="#6.5">6.5 SGI/Irix</A></LI>
       <LI><A HREF="#6.6">6.6 QNX</A></LI>
+      <LI><A HREF="#6.7">6.7 OpenBSD</A></LI>
     </UL>
   <LI><A HREF="#A">A. Authors</A></LI>
   <UL>
@@ -1607,6 +1608,28 @@ Anyone has closer info?</P>
   QNX has only X <I>emulation</I> which is VERY slow. Use SDL.</P>
 
 
+<P><B><A NAME=6.7>6.7. OpenBSD</A></B></P> 
+    
+<P>To build the package you will need GNU make (gmake,
+/usr/ports/devel/gmake), native BSD make will not work, and a recent
+binutils (including objcopy).</P>
+
+<P> Presently you must give the option '--disable-mpdvdkit' to 
+configure, else it won't compile. </P>
+
+<P>Due to limitations in different versions of gas (relocation vs mmx)
+, you'll need to compile in two steps: First make sure that the
+non-native as is first in PATH and do a 'gmake -k', then make sure
+that the native version i used an do 'gmake'.</P>
+
+<P>To w32-dll's with <B>MPlayer</B> you will need to re-compile the
+kernel with "option USER_LDT".</P>
+
+<P>If <B>MPlayer</B> complains about not finding '/dev/cdrom' or
+'/dev/dvd' make a symbolic link, eg <CODE>ln -s
+/dev/(your_cdrom_device) /dev/cdrom</CODE></P>
+
+
 <P><B><A NAME=A>Appendix A - Authors</A></B></P>
 
 <P>NOTE: Do *NOT* send bugreports, help &amp; feature requests directly to the authors!</P>
diff --git a/configure b/configure
index a1373265a4..26ffc32700 100755
--- a/configure
+++ b/configure
@@ -3509,6 +3509,7 @@ test "$_xanim" = yes && _ld_dl_dynamic='-rdynamic'
 _ld_arch="$_ld_arch $_ld_pthread $_ld_dl $_ld_dl_dynamic"
 bsdos && _ld_arch="$_ld_arch -ldvd"
 netbsd && _ld_arch="$_ld_arch -li386 -lossaudio"
+openbsd && _ld_arch="$_ld_arch -li386 -lossaudio"
 
 _def_debug='#undef MP_DEBUG'
 test "$_debug" && _def_debug='#define MP_DEBUG 1'
diff --git a/loader/Makefile b/loader/Makefile
index aa2cd4a05c..c1035125b0 100644
--- a/loader/Makefile
+++ b/loader/Makefile
@@ -32,6 +32,9 @@ distclean: clean
 
 libloader.a:  $(LIB_OBJECTS) stubs.s
 	$(CC) -c ./stubs.s -o stubs.o
+ifeq ($(TARGET_OS),OpenBSD)
+	./loader_objfix.sh
+endif
 	$(AR) -r libloader.a $(LIB_OBJECTS) stubs.o
 
 dep:
diff --git a/loader/loader_objfix.sh b/loader/loader_objfix.sh
new file mode 100755
index 0000000000..99eb27a7f0
--- /dev/null
+++ b/loader/loader_objfix.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+# This script fixes up symbol mangling in GNU as code of stubs.s.
+# This file is licensed under the GPL, more info at http://www.fsf.org/
+for i in "export_names" \
+       "printf" \
+       "exp_EH_prolog" \
+       "unk_exp1"
+do
+echo "fixing: $i=_$i"
+objcopy --redefine-sym "$i=_$i" stubs.o
+done