diff --git a/emulators/simh/Makefile b/emulators/simh/Makefile
index 70683dfdce4..9c8bac9a498 100644
--- a/emulators/simh/Makefile
+++ b/emulators/simh/Makefile
@@ -1,13 +1,13 @@
-# $OpenBSD: Makefile,v 1.57 2007/05/10 21:01:15 matthieu Exp $
+# $OpenBSD: Makefile,v 1.58 2007/07/24 20:45:41 kili 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.7
+DISTNAME=		simh-3.7.2
 PKGNAME=		${DISTNAME}
 CATEGORIES=		emulators
 MASTER_SITES=		http://simh.trailing-edge.com/sources/
-DISTFILES=		simhv37-0.zip
+DISTFILES=		simhv37-2.zip
 
 HOMEPAGE=		http://simh.trailing-edge.com/
 
diff --git a/emulators/simh/distinfo b/emulators/simh/distinfo
index b028930c646..eaade4fcc36 100644
--- a/emulators/simh/distinfo
+++ b/emulators/simh/distinfo
@@ -1,5 +1,5 @@
-MD5 (simhv37-0.zip) = X18Df4xxCGK8ciPVvgEMQA==
-RMD160 (simhv37-0.zip) = fs0xd9F8hxpLM/rhMRH6ChlnhRE=
-SHA1 (simhv37-0.zip) = 4kp3fZgCbct0XAoGID6alvTQ/DA=
-SHA256 (simhv37-0.zip) = I65Ti3YH0jHZ5kwXC3pMx7fJ0MHIu9ZixWWsClbRUGk=
-SIZE (simhv37-0.zip) = 2362666
+MD5 (simhv37-2.zip) = da1ulGLTUmCWX98TodHQnw==
+RMD160 (simhv37-2.zip) = mcHuWqAHZVszJ631dAbgamebreY=
+SHA1 (simhv37-2.zip) = o5XC9//7zqcA2XFq3Pde5C3qW0c=
+SHA256 (simhv37-2.zip) = 8OEK3kdaDTZ9+0Okiin/DbaA3KGn1tqHnl7q0Twft94=
+SIZE (simhv37-2.zip) = 2360237
diff --git a/emulators/simh/patches/patch-PDP11_pdp11_vh_c b/emulators/simh/patches/patch-PDP11_pdp11_vh_c
index b9ccec51ed3..0ded674b5aa 100644
--- a/emulators/simh/patches/patch-PDP11_pdp11_vh_c
+++ b/emulators/simh/patches/patch-PDP11_pdp11_vh_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-PDP11_pdp11_vh_c,v 1.2 2007/05/10 21:01:15 matthieu Exp $
---- PDP11/pdp11_vh.c.orig	Sun Oct 29 11:39:20 2006
-+++ PDP11/pdp11_vh.c	Tue May  8 21:33:31 2007
-@@ -86,7 +86,7 @@ extern FILE	*sim_log;
+$OpenBSD: patch-PDP11_pdp11_vh_c,v 1.3 2007/07/24 20:45:41 kili Exp $
+--- PDP11/pdp11_vh.c.orig	Mon Jun 18 08:34:04 2007
++++ PDP11/pdp11_vh.c	Sun Jul 22 19:37:59 2007
+@@ -87,7 +87,7 @@ extern FILE	*sim_log;
  #endif
  #define	VH_MNOMASK	(VH_MUXES - 1)
  
diff --git a/emulators/simh/patches/patch-VAX_vax_sysdev_c b/emulators/simh/patches/patch-VAX_vax_sysdev_c
index 7c95c685fae..74b9d2538e7 100644
--- a/emulators/simh/patches/patch-VAX_vax_sysdev_c
+++ b/emulators/simh/patches/patch-VAX_vax_sysdev_c
@@ -1,6 +1,6 @@
-$OpenBSD: patch-VAX_vax_sysdev_c,v 1.4 2007/05/10 21:01:15 matthieu Exp $
---- VAX/vax_sysdev.c.orig	Fri Dec 29 13:11:24 2006
-+++ VAX/vax_sysdev.c	Tue May  8 21:33:31 2007
+$OpenBSD: patch-VAX_vax_sysdev_c,v 1.5 2007/07/24 20:45:41 kili Exp $
+--- VAX/vax_sysdev.c.orig	Tue Jun 19 14:29:20 2007
++++ VAX/vax_sysdev.c	Sun Jul 22 19:37:59 2007
 @@ -53,6 +53,10 @@
  
  #include "vax_defs.h"
@@ -12,7 +12,7 @@ $OpenBSD: patch-VAX_vax_sysdev_c,v 1.4 2007/05/10 21:01:15 matthieu Exp $
  #define UNIT_V_NODELAY  (UNIT_V_UF + 0)                 /* ROM access equal to RAM access */
  #define UNIT_NODELAY    (1u << UNIT_V_NODELAY)
  
-@@ -1520,10 +1524,10 @@ conpc = 0;
+@@ -1519,10 +1523,10 @@ conpc = 0;
  conpsl = PSL_IS | PSL_IPL1F | CON_PWRUP;
  if (rom == NULL) return SCPE_IERR;
  if (*rom == 0) {                                        /* no boot? */
diff --git a/emulators/simh/patches/patch-makefile b/emulators/simh/patches/patch-makefile
index 06e95f701e6..1ea65388090 100644
--- a/emulators/simh/patches/patch-makefile
+++ b/emulators/simh/patches/patch-makefile
@@ -1,36 +1,28 @@
-$OpenBSD: patch-makefile,v 1.10 2007/05/10 21:01:15 matthieu Exp $
---- makefile.orig	Fri Feb  2 07:12:20 2007
-+++ makefile	Tue May  8 21:43:20 2007
-@@ -3,28 +3,28 @@
+$OpenBSD: patch-makefile,v 1.11 2007/07/24 20:45:41 kili Exp $
+--- makefile.orig	Tue Feb  6 19:24:54 2007
++++ makefile	Sun Jul 22 20:02:53 2007
+@@ -3,32 +3,9 @@
  # Note: -O2 is sometimes broken in GCC when setjump/longjump is being
  # used. Try -O2 only with released simulators.
  #
 -ifeq ($(WIN32),)
-+#ifeq ($(WIN32),)
- #Unix Environments
+-#Unix Environments
 -ifeq ($(OSTYPE),solaris)
 -OS_CCDEFS = -lsocket -lnsl -lpthread -D_GNU_SOURCE
 -else
 -OS_CCDEFS = -D_GNU_SOURCE
 -endif
+-ifeq ($(OSTYPE),macos)
 -CC = gcc -std=c99 -O2 -U__STRICT_ANSI__ -g -lm -lrt $(OS_CCDEFS) -I .
+-else
+-CC = gcc -std=c99 -O2 -U__STRICT_ANSI__ -g -lm $(OS_CCDEFS) -I .
+-endif
 -ifeq ($(USE_NETWORK),)
 -else
 -NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include /usr/local/lib/libpcap.a
 -endif
 -else
-+#ifeq ($(OSTYPE),solaris)
-+#OS_CCDEFS = -lsocket -lnsl -lpthread -D_GNU_SOURCE
-+#else
-+OS_CCDEFS = -D_GNU_SOURCE $(CFLAGS)
-+#endif
-+CC = gcc -std=c99 -O2 -U__STRICT_ANSI__ -g -lm  $(OS_CCDEFS) -I .
-+#ifeq ($(USE_NETWORK),)
-+#else
-+NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include -lpcap
-+#endif
-+#else
- #Win32 Environments
+-#Win32 Environments
 -LDFLAGS = -lm -lwsock32 -lwinmm
 -CC = gcc -std=c99 -U__STRICT_ANSI__ -O0 -I.
 -EXE = .exe
@@ -39,18 +31,13 @@ $OpenBSD: patch-makefile,v 1.10 2007/05/10 21:01:15 matthieu Exp $
 -NETWORK_OPT = -DUSE_NETWORK -lwpcap -lpacket
 -endif
 -endif
-+#LDFLAGS = -lm -lwsock32 -lwinmm
-+#CC = gcc -std=c99 -U__STRICT_ANSI__ -O0 -I.
-+#EXE = .exe
-+#ifeq ($(USE_NETWORK),)
-+#else
-+#NETWORK_OPT = -DUSE_NETWORK -lwpcap -lpacket
-+#endif
-+#endif
++OS_CCDEFS = -D_GNU_SOURCE $(CFLAGS)
++CC = gcc -std=c99 -O2 -U__STRICT_ANSI__ -g -lm  $(OS_CCDEFS) -I .
++NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include -lpcap
  
  #
  # Common Libraries
-@@ -244,11 +244,7 @@ ALL = pdp1 pdp4 pdp7 pdp8 pdp9 pdp15 pdp11 pdp10 \
+@@ -248,11 +225,7 @@ ALL = pdp1 pdp4 pdp7 pdp8 pdp9 pdp15 pdp11 pdp10 \
  all : ${ALL}
  
  clean :
diff --git a/emulators/simh/patches/patch-scp_c b/emulators/simh/patches/patch-scp_c
index 7a8752662f9..5a60a1f93a6 100644
--- a/emulators/simh/patches/patch-scp_c
+++ b/emulators/simh/patches/patch-scp_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-scp_c,v 1.12 2007/05/10 21:01:15 matthieu Exp $
---- scp.c.orig	Tue Jan 30 10:54:12 2007
-+++ scp.c	Tue May  8 21:33:31 2007
-@@ -657,7 +657,10 @@ while (stat != SCPE_EXIT) {                           
+$OpenBSD: patch-scp_c,v 1.13 2007/07/24 20:45:41 kili Exp $
+--- scp.c.orig	Sun Apr 29 10:18:44 2007
++++ scp.c	Sun Jul 22 19:37:59 2007
+@@ -661,7 +661,10 @@ while (stat != SCPE_EXIT) {                           
      else if (sim_vm_read != NULL)                       /* sim routine? */
          cptr = (*sim_vm_read) (cbuf, CBUFSIZE, stdin);
      else cptr = read_line (cbuf, CBUFSIZE, stdin);      /* read command line */
diff --git a/emulators/simh/patches/patch-sim_ether_c b/emulators/simh/patches/patch-sim_ether_c
index 9532f2bf734..19a03440d37 100644
--- a/emulators/simh/patches/patch-sim_ether_c
+++ b/emulators/simh/patches/patch-sim_ether_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-sim_ether_c,v 1.8 2007/05/10 21:01:15 matthieu Exp $
---- sim_ether.c.orig	Sun Oct 15 14:58:04 2006
-+++ sim_ether.c	Tue May  8 21:33:31 2007
-@@ -729,7 +729,7 @@ t_stat eth_open(ETH_DEV* dev, char* name, DEVICE* dptr
+$OpenBSD: patch-sim_ether_c,v 1.9 2007/07/24 20:45:41 kili Exp $
+--- sim_ether.c.orig	Thu May 17 12:08:20 2007
++++ sim_ether.c	Sun Jul 22 19:37:59 2007
+@@ -919,7 +919,7 @@ t_stat eth_open(ETH_DEV* dev, char* name, DEVICE* dptr
        /* probably is not ethX and has no description */
        savname = eth_getname_byname(name, temp);
        if (savname == 0) /* didn't translate */
diff --git a/emulators/simh/pkg/PLIST b/emulators/simh/pkg/PLIST
index eb1d9c3fbe0..7a84494b014 100644
--- a/emulators/simh/pkg/PLIST
+++ b/emulators/simh/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.23 2007/05/10 21:01:15 matthieu Exp $
+@comment $OpenBSD: PLIST,v 1.24 2007/07/24 20:45:41 kili Exp $
 bin/simh-altair
 bin/simh-altairz80
 bin/simh-eclipse
@@ -33,7 +33,6 @@ share/doc/simh/
 share/doc/simh/0readme_37.txt
 share/doc/simh/0readme_ethernet.txt
 share/doc/simh/altair.txt
-share/doc/simh/altairz80_doc.txt
 share/doc/simh/eclipse.txt
 share/doc/simh/haltguide.txt
 share/doc/simh/hp2100_diag.txt