diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index 75d33104857..6159cedafee 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.25 2002/10/26 12:52:48 naddy Exp $
+# $OpenBSD: Makefile,v 1.26 2002/12/28 06:20:19 todd Exp $
 # $NetBSD: Makefile,v 1.2 1998/09/22 06:11:36 garbled Exp $
 
 COMMENT=	"x86 machine simulator"
 
-DISTNAME=	bochs-1.4
+DISTNAME=	bochs-2.0
 CATEGORIES=	emulators
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bochs/}
@@ -23,7 +23,7 @@ CONFIGURE_ARGS=	--enable-cdrom \
 		--enable-ne2000 \
 		--enable-vga
 
-FLAVORS=	debug i386 i486 i686 pci smp no_x11 term
+FLAVORS=	debug i386 i486 i686 x86_64 pci smp smp_4 smp_8 no_x11 term
 FLAVOR?=
 
 .if ${FLAVOR:L:Mdebug}
@@ -40,21 +40,35 @@ CONFIGURE_ARGS+= --with-x11
 .endif
 
 .if ${FLAVOR:L:Mi386}
-CONFIGURE_ARGS+= --enable-cpu-level="3"
+CONFIGURE_ARGS+= --enable-cpu-level="3" --disable-mmx --disable-x86-64
 .elif ${FLAVOR:L:Mi486}
-CONFIGURE_ARGS+= --enable-cpu-level="4"
+CONFIGURE_ARGS+= --enable-cpu-level="4" --disable-mmx --disable-x86-64
 .elif ${FLAVOR:L:Mi686}
-CONFIGURE_ARGS+= --enable-cpu-leve="6"
+CONFIGURE_ARGS+= --enable-cpu-leve="6" --disable-x86-64
+.elif ${FLAVOR:L:Mx86_64}
+CONFIGURE_ARGS+= --enable-x86-64
 .else
-CONFIGURE_ARGS+= --enable-cpu-level="5"
+CONFIGURE_ARGS+= --enable-cpu-level="5" --disable-x86-64
 .endif
 
 .if ${FLAVOR:L:Mpci}
 CONFIGURE_ARGS+= --enable-pci
 .endif
 
-.if ${FLAVOR:L:Msmp}
+.if ${FLAVOR:L:Msmp} || ${FLAVOR:L:Msmp_4} || ${FLAVOR:L:Msmp_8}
+. if ! ( ${FLAVOR:L:Mi686} || ${FLAVOR:L:Mx86_64} )
+BROKEN= "must use i686 or x86_64 flavor for smp"
+. endif
+. if ${FLAVOR:L:Msmp_8}
+CONFIGURE_ARGS+= --enable-processors=8
+. elif ${FLAVOR:L:Msmp_4}
+CONFIGURE_ARGS+= --enable-processors=4
+. else
 CONFIGURE_ARGS+= --enable-processors=2
+. endif
+CONFIGURE_ARGS+= --enable-apic
+.else
+CONFIGURE_ARGS+= --disable-apic
 .endif
 
 post-configure:
@@ -63,9 +77,12 @@ post-configure:
 
 NO_REGRESS=	Yes
 
-BIOS  = BIOS-bochs-4-processors BIOS-bochs-2-processors
+.for _ncpu in 2 4 8
+BIOS  += BIOS-bochs-${_ncpu}-processors
+.endfor
 BIOS += BIOS-bochs-latest
-BIOS += VGABIOS-elpin-2.40
+BIOS += VGABIOS-elpin-2.40 VGABIOS-elpin-LICENSE
+BIOS += VGABIOS-lgpl-latest VGABIOS-lgpl-README
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/bochs/bios
diff --git a/emulators/bochs/distinfo b/emulators/bochs/distinfo
index b2c968ded8d..49933e86abd 100644
--- a/emulators/bochs/distinfo
+++ b/emulators/bochs/distinfo
@@ -1,3 +1,3 @@
-MD5 (bochs-1.4.tar.gz) = e8a6ad67f78c63423545806886f8c66a
-RMD160 (bochs-1.4.tar.gz) = 1050ef791c4a5b41c3359150d50e4490f61173df
-SHA1 (bochs-1.4.tar.gz) = db5f1763c8d048831daad34fa81b0f3b15e5e0a8
+MD5 (bochs-2.0.tar.gz) = 11f613f0383791a958d6528d30ab8e1d
+RMD160 (bochs-2.0.tar.gz) = d495fe79e12b3b0a2fd753ca4e2c3eb180c81579
+SHA1 (bochs-2.0.tar.gz) = 1a652f4e461cb2e7a3f9db3969802ba41eac1c50
diff --git a/emulators/bochs/patches/patch-configure b/emulators/bochs/patches/patch-configure
deleted file mode 100644
index c2b20140fe2..00000000000
--- a/emulators/bochs/patches/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-configure,v 1.3 2002/06/09 16:24:57 brad Exp $
---- configure.orig	Mon May 20 16:33:43 2002
-+++ configure	Mon May 20 16:33:58 2002
-@@ -6169,6 +6169,7 @@ else
-   cat >conftest.$ac_ext <<_ACEOF
- #line 6170 "configure"
- #include "confdefs.h"
-+#include <sys/types.h>
- #include <sys/socket.h>
- 
- int
diff --git a/emulators/bochs/patches/patch-gui_Makefile_in b/emulators/bochs/patches/patch-gui_Makefile_in
deleted file mode 100644
index f484ce71f55..00000000000
--- a/emulators/bochs/patches/patch-gui_Makefile_in
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-gui_Makefile_in,v 1.3 2002/06/09 16:24:57 brad Exp $
---- gui/Makefile.in.orig	Sun Apr  7 15:35:49 2002
-+++ gui/Makefile.in	Sun Apr  7 15:36:23 2002
-@@ -82,6 +82,9 @@ $(BX_GUI_OBJS) : $(BX_INCLUDES)
- beos.o: beos.@CPP_SUFFIX@
- 	$(CXX) -c $(CXXFLAGS) $(LOCAL_CXXFLAGS) $(BX_INCDIRS) $(BEOS_CFLAGS) $<
- 
-+gui.o: gui.@CPP_SUFFIX@
-+	$(CXX) -c $(CXXFLAGS) $(LOCAL_CXXFLAGS) $(BX_INCDIRS) $(X_CFLAGS) $<
-+
- x.o: x.@CPP_SUFFIX@
- 	$(CXX) -c $(CXXFLAGS) $(LOCAL_CXXFLAGS) $(BX_INCDIRS) $(X_CFLAGS) $<
- 
diff --git a/emulators/bochs/patches/patch-gui_term_cc b/emulators/bochs/patches/patch-gui_term_cc
new file mode 100644
index 00000000000..26fc50a64f1
--- /dev/null
+++ b/emulators/bochs/patches/patch-gui_term_cc
@@ -0,0 +1,24 @@
+$OpenBSD: patch-gui_term_cc,v 1.3 2002/12/28 06:20:20 todd Exp $
+--- gui/term.cc.orig	Fri Dec 27 22:24:46 2002
++++ gui/term.cc	Fri Dec 27 22:43:22 2002
+@@ -114,7 +114,8 @@ bx_term_gui_c::get_sighandler_mask ()
+ #ifdef SIGTSTP
+     | (1<<SIGTSTP)
+ #endif
+-    | (1<<SIGTERM);
++    | (1<<SIGTERM)
++    | (1<<SIGUSR1);
+ }
+ 
+ void
+@@ -134,6 +135,10 @@ bx_term_gui_c::sighandler(int signo)
+ 		do_scan(BX_KEY_Z,0,1,0);
+ 		break;
+ #endif
++	case SIGUSR1:
++    		LOG_THIS floppyA_status = !LOG_THIS floppyA_status;
++    		DEV_floppy_set_media_status(0, LOG_THIS floppyA_status);
++		break;
+ 	default:
+ 		BX_INFO(("sig %d caught",signo));
+ 		break;
diff --git a/emulators/bochs/patches/patch-main_cc b/emulators/bochs/patches/patch-main_cc
new file mode 100644
index 00000000000..25b378a2122
--- /dev/null
+++ b/emulators/bochs/patches/patch-main_cc
@@ -0,0 +1,11 @@
+$OpenBSD: patch-main_cc,v 1.4 2002/12/28 06:20:20 todd Exp $
+--- main.cc.orig	Fri Dec 27 22:16:47 2002
++++ main.cc	Fri Dec 27 22:16:50 2002
+@@ -2179,6 +2179,7 @@ bx_init_hardware()
+ #if !BX_DEBUGGER
+   signal(SIGINT, bx_signal_handler);
+ #endif
++  signal(SIGUSR1, bx_signal_handler);
+ 
+ #if BX_SHOW_IPS
+ #ifndef __MINGW32__
diff --git a/emulators/bochs/pkg/DESCR b/emulators/bochs/pkg/DESCR
index 2e68bbeb78f..22aeff9c7e5 100644
--- a/emulators/bochs/pkg/DESCR
+++ b/emulators/bochs/pkg/DESCR
@@ -8,8 +8,11 @@ Flavors:
 	i386   - emulate 386 instruction set
 	i486   - emulate 486 instruction set
 	i686   - emulate 686 instruction set
+	x86_64 - emulate x86_64 instruction set
 	pci    - build with support for i440FX PCI chipset
 	smp    - build with support for SMP (2 CPUs)
+	smp_4  - build with support for SMP (4 CPUs)
+	smp_8  - build with support for SMP (8 CPUs)
 	no_x11 - do not build with X support
 	term   - build with support for textmode terminal environment
 
diff --git a/emulators/bochs/pkg/PLIST b/emulators/bochs/pkg/PLIST
index cef2aa51624..34546a374ec 100644
--- a/emulators/bochs/pkg/PLIST
+++ b/emulators/bochs/pkg/PLIST
@@ -1,14 +1,17 @@
-@comment $OpenBSD: PLIST,v 1.9 2002/06/09 16:24:57 brad Exp $
+@comment $OpenBSD: PLIST,v 1.10 2002/12/28 06:20:20 todd Exp $
 bin/bochs
 bin/bximage
 man/man1/bochs-dlx.1
 man/man1/bochs.1
-man/man1/bochsrc.1
 man/man1/bximage.1
 share/bochs/bios/BIOS-bochs-2-processors
 share/bochs/bios/BIOS-bochs-4-processors
+share/bochs/bios/BIOS-bochs-8-processors
 share/bochs/bios/BIOS-bochs-latest
 share/bochs/bios/VGABIOS-elpin-2.40
+share/bochs/bios/VGABIOS-elpin-LICENSE
+share/bochs/bios/VGABIOS-lgpl-latest
+share/bochs/bios/VGABIOS-lgpl-README
 share/bochs/bochsrc
 share/bochs/fonts/fonts.dir
 share/bochs/fonts/hercules.bdf
@@ -25,7 +28,6 @@ share/doc/bochs/configure.html
 share/doc/bochs/construction.html
 share/doc/bochs/cosimulation.html
 share/doc/bochs/cvs-status.html
-share/doc/bochs/debugger.html
 share/doc/bochs/developers.html
 share/doc/bochs/faq.html
 share/doc/bochs/features.html