diff --git a/configure.in b/configure.in
index 2282de7c438..0059f249779 100644
--- a/configure.in
+++ b/configure.in
@@ -5454,6 +5454,14 @@ if test -n "$MOZ_VP8" -a -z "$MOZ_NATIVE_LIBVPX"; then
       VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
       VPX_X86_ASM=1
     ;;
+    OpenBSD:x86)
+      VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
+      VPX_X86_ASM=1
+    ;;
+    OpenBSD:x86_64)
+      VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
+      VPX_X86_ASM=1
+    ;;
     Darwin:x86)
       VPX_ASFLAGS="-f macho32 -rnasm -pnasm -DPIC"
       VPX_X86_ASM=1
diff --git a/media/libvpx/update.sh b/media/libvpx/update.sh
index d1cdb6149ab..79e0fb160b9 100755
--- a/media/libvpx/update.sh
+++ b/media/libvpx/update.sh
@@ -363,12 +363,12 @@ cp $1/objdir/x86-win32-vs8/vpx_config.h vpx_config_x86-win32-vs8.h
 # Should be same for all platforms...
 cp $1/objdir/x86-win32-vs8/vpx_version.h vpx_version.h
 
-# Config files for x86-linux-gcc and Solaris x86
+# Config files for x86-linux-gcc, OpenBSD/i386 and Solaris x86
 cp $1/objdir/x86-linux-gcc/vpx_config.c vpx_config_x86-linux-gcc.c
 cp $1/objdir/x86-linux-gcc/vpx_config.asm vpx_config_x86-linux-gcc.asm
 cp $1/objdir/x86-linux-gcc/vpx_config.h vpx_config_x86-linux-gcc.h
 
-# Config files for x86_64-linux-gcc and Solaris x86_64
+# Config files for x86_64-linux-gcc, OpenBSD/amd64 and Solaris x86_64
 cp $1/objdir/x86_64-linux-gcc/vpx_config.c vpx_config_x86_64-linux-gcc.c
 cp $1/objdir/x86_64-linux-gcc/vpx_config.asm vpx_config_x86_64-linux-gcc.asm
 cp $1/objdir/x86_64-linux-gcc/vpx_config.h vpx_config_x86_64-linux-gcc.h
diff --git a/media/libvpx/vpx_config.h b/media/libvpx/vpx_config.h
index 5f307b587b5..55433f3b741 100644
--- a/media/libvpx/vpx_config.h
+++ b/media/libvpx/vpx_config.h
@@ -24,6 +24,14 @@
 /* 64 bit Linux. */
 #include "vpx_config_x86_64-linux-gcc.h"
 
+#elif defined(__OpenBSD__) && defined(__i386__)
+/* 32 bit OpenBSD. */
+#include "vpx_config_x86-linux-gcc.h"
+
+#elif defined(__OpenBSD__) && defined(__x86_64__)
+/* 64 bit OpenBSD. */
+#include "vpx_config_x86_64-linux-gcc.h"
+
 #elif defined(__sun) && defined(__i386)
 /* 32 bit Solaris. */
 #include "vpx_config_x86-linux-gcc.h"
diff --git a/media/libvpx/vpx_config_c.c b/media/libvpx/vpx_config_c.c
index 5a8b890175a..eedd5159d87 100644
--- a/media/libvpx/vpx_config_c.c
+++ b/media/libvpx/vpx_config_c.c
@@ -23,6 +23,14 @@
 /* 64 bit Linux. */
 #include "vpx_config_x86_64-linux-gcc.c"
 
+#elif defined(__OpenBSD__) && defined(__i386)
+/* 32 bit OpenBSD. */
+#include "vpx_config_x86-linux-gcc.h"
+
+#elif defined(__OpenBSD__) && defined(__x86_64)
+/* 64 bit OpenBSD. */
+#include "vpx_config_x86_64-linux-gcc.h"
+
 #elif defined(__sun) && defined(__i386)
 /* 32 bit Solaris. */
 #include "vpx_config_x86-linux-gcc.h"