diff --git a/emulators/simh/Makefile b/emulators/simh/Makefile
index a82eccfe28f..9b2ac8c2af0 100644
--- a/emulators/simh/Makefile
+++ b/emulators/simh/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.54 2006/07/08 11:19:41 fgsch Exp $
+# $OpenBSD: Makefile,v 1.55 2006/07/10 17:55:44 fgsch Exp $
 # $NetBSD: Makefile,v 1.2 1998/08/23 20:48:03 frueauf Exp $
 
 COMMENT=		"PDP, IBM 1401, Nova and other CPUs simulator"
 
 DISTNAME=		simh-3.6.0
+PKGNAME=		${DISTNAME}p0
 CATEGORIES=		emulators
 MASTER_SITES=		http://simh.trailing-edge.com/sources/
 DISTFILES=		simhv36-0.zip
@@ -22,7 +23,9 @@ WRKDIST=		${WRKDIR}
 
 UNZIP=			unzip -a -o
 
-COPTS+=			-DPATH_KA655X_BIN=\"${PREFIX}/lib/simh/vax/ka655x.bin\"
+COPTS+=		-DPATH_KA655X_BIN=\"${PREFIX}/lib/simh/vax/ka655x.bin\" \
+		-DPATH_VMB_EXE=\"${PREFIX}/lib/simh/vax/vmb.exe\"
+
 MAKE_FILE=		makefile
 
 NO_REGRESS=		Yes
@@ -37,6 +40,7 @@ do-install:
 	done;
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/simh/vax
 	${INSTALL_DATA} ${WRKDIST}/VAX/ka655x.bin ${PREFIX}/lib/simh/vax
+	${INSTALL_DATA} ${WRKDIST}/VAX/vmb.exe ${PREFIX}/lib/simh/vax
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/simh
 	${INSTALL_DATA} ${WRKBUILD}/*.txt ${WRKBUILD}/*/*.txt \
 	    ${PREFIX}/share/doc/simh
diff --git a/emulators/simh/patches/patch-PDP11_pdp11_vh_c b/emulators/simh/patches/patch-PDP11_pdp11_vh_c
new file mode 100644
index 00000000000..9726a16bdb2
--- /dev/null
+++ b/emulators/simh/patches/patch-PDP11_pdp11_vh_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-PDP11_pdp11_vh_c,v 1.1 2006/07/10 17:55:44 fgsch Exp $
+--- PDP11/pdp11_vh.c.orig	Sat Jul  8 19:19:57 2006
++++ PDP11/pdp11_vh.c	Sat Jul  8 19:19:59 2006
+@@ -85,7 +85,7 @@ extern FILE	*sim_log;
+ #endif
+ #define	VH_MNOMASK	(VH_MUXES - 1)
+ 
+-#define	VH_LINES	(8)
++#define	VH_LINES	(16)
+ 
+ #define	UNIT_V_MODEDHU	(UNIT_V_UF + 0)
+ #define	UNIT_V_FASTDMA	(UNIT_V_UF + 1)
diff --git a/emulators/simh/patches/patch-VAX_vax780_sbi_c b/emulators/simh/patches/patch-VAX_vax780_sbi_c
new file mode 100644
index 00000000000..9436df5eb35
--- /dev/null
+++ b/emulators/simh/patches/patch-VAX_vax780_sbi_c
@@ -0,0 +1,28 @@
+$OpenBSD: patch-VAX_vax780_sbi_c,v 1.1 2006/07/10 17:55:44 fgsch Exp $
+--- VAX/vax780_sbi.c.orig	Thu May 11 08:53:04 2006
++++ VAX/vax780_sbi.c	Sat Jul  8 19:18:19 2006
+@@ -32,6 +32,10 @@
+ 
+ #include "vax_defs.h"
+ 
++#ifndef PATH_VMB_EXE
++#define PATH_VMB_EXE	"vmb.exe"
++#endif
++
+ /* 11/780 specific IPRs */
+ 
+ /* Writeable control store */
+@@ -643,10 +647,10 @@ t_stat cpu_boot (int32 unitno, DEVICE *d
+ {
+ t_stat r;
+ 
+-printf ("Loading boot code from vmb.exe\n");
++printf ("Loading boot code from %s\n", PATH_VMB_EXE);
+ if (sim_log) fprintf (sim_log, 
+-    "Loading boot code from vmb.exe\n");
+-r = load_cmd (0, "-O vmb.exe 200");
++    "Loading boot code from %s\n", PATH_VMB_EXE);
++r = load_cmd (0, "-O " PATH_VMB_EXE " 200");
+ if (r != SCPE_OK) return r;
+ SP = PC = 512;
+ return SCPE_OK;
diff --git a/emulators/simh/pkg/PLIST b/emulators/simh/pkg/PLIST
index 8e18c4385f0..33ce5917df9 100644
--- a/emulators/simh/pkg/PLIST
+++ b/emulators/simh/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.20 2006/07/08 11:19:41 fgsch Exp $
+@comment $OpenBSD: PLIST,v 1.21 2006/07/10 17:55:44 fgsch Exp $
 bin/simh-altair
 bin/simh-altairz80
 bin/simh-eclipse
@@ -28,6 +28,7 @@ bin/simh-vax780
 lib/simh/
 lib/simh/vax/
 lib/simh/vax/ka655x.bin
+lib/simh/vax/vmb.exe
 share/doc/simh/
 share/doc/simh/0readme_36.txt
 share/doc/simh/0readme_ethernet.txt