diff --git a/emulators/simh-hp2100/Makefile b/emulators/simh-hp2100/Makefile
index dc5e65461f37..0536bb1f735f 100644
--- a/emulators/simh-hp2100/Makefile
+++ b/emulators/simh-hp2100/Makefile
@@ -1,44 +1,44 @@
 PORTNAME=	hp2100
-DISTVERSION=	3.11-0.29
+DISTVERSION=	3.11-0.31
 CATEGORIES=	emulators
 MASTER_SITES=	http://simh.trailing-edge.com/hp/releases/:src \
 		http://simh.trailing-edge.com/hp/docs/:app \
 		http://www.ml1.org.uk/distfiles/:src \
 		http://www.ml1.org.uk/distfiles/:app
 PKGNAMEPREFIX=	simh-
 DISTFILES=	HP2100-source-release-${DISTVERSION:E}.zip:src
 DIST_SUBDIR=	simh-hp
 EXTRACT_ONLY=	HP2100-source-release-${DISTVERSION:E}.zip
 
 MAINTAINER=	bob@eager.cx
 COMMENT=	Emulates classic HP 2100 computers
 
 LICENSE=	SIMHv1
 LICENSE_NAME=	SIMH License
 LICENSE_FILE=	${FILESDIR}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 RUN_DEPENDS=	${LOCALBASE}/share/doc/hpdoc/simh_doc.pdf:emulators/simh-hpdoc
 
 USES=		gmake dos2unix zip
 
 NO_WRKSUBDIR=	yes
 
 CONFLICTS_INSTALL=	simh-3.[789]*
 DOS2UNIX_GLOB=	*.c *.h *.txt *.mak makefile
 
 SUB_FILES=	hp2100.1
 
 .include <bsd.port.pre.mk>
 
 do-build:
 	(cd ${WRKSRC}; GCC="${CC}" ${GMAKE} -C SCP hp2100)
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/hp2100 ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKDIR}/hp2100.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/SCP/doc/*.txt ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/SCP/doc/hp2100_guide.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
diff --git a/emulators/simh-hp2100/distinfo b/emulators/simh-hp2100/distinfo
index 4b1e8879500f..8693be4e7760 100644
--- a/emulators/simh-hp2100/distinfo
+++ b/emulators/simh-hp2100/distinfo
@@ -1,7 +1,3 @@
-TIMESTAMP = 1582463933
-SHA256 (simh-hp/HP2100-source-release-29.zip) = e381eb51cdbea84a729fe0fa45001b7a864adcbf97438af0c788696b0c18c0bf
-SIZE (simh-hp/HP2100-source-release-29.zip) = 1890682
-SHA256 (simh-hp/running_hp_2000_tsb.pdf) = 905f8748d38b60a2f128961126086268f5f1485d625572333fee418beec85300
-SIZE (simh-hp/running_hp_2000_tsb.pdf) = 111280
-SHA256 (simh-hp/hp_1000_io_simulation.pdf) = 64a523a8237ed6143614c1b0747f5aa933b8e77e2cf5daf9fe62a3845aea8dc8
-SIZE (simh-hp/hp_1000_io_simulation.pdf) = 272289
+TIMESTAMP = 1621888174
+SHA256 (simh-hp/HP2100-source-release-31.zip) = 091e5decf4527e45435f3052c5eb07a70aa8a4349b4b1a0ba4e1e7d55423d748
+SIZE (simh-hp/HP2100-source-release-31.zip) = 2012600
diff --git a/emulators/simh-hp2100/files/patch-SCP_makefile b/emulators/simh-hp2100/files/patch-SCP_makefile
deleted file mode 100644
index d3d8c34caa8d..000000000000
--- a/emulators/simh-hp2100/files/patch-SCP_makefile
+++ /dev/null
@@ -1,17 +0,0 @@
---- SCP/makefile.orig	2020-08-23 21:51:23 UTC
-+++ SCP/makefile
-@@ -532,10 +532,12 @@ ifneq ($(DONT_USE_READER_THREAD),)
- endif
- 
- 
--# Shut up annoying clang default warnings.
-+# Shut up annoying clang default warnings, and also fix
-+# multiply defined symbols on clang 11 and above
- 
--ifeq ($(GCC),clang)
-+ifeq ($(findstring clang,$(COMPILER_NAME)),clang)
-   OS_CCDEFS += -Wno-parentheses -Wno-bitwise-op-parentheses -Wno-dangling-else
-+  CFLAGS_O += -fcommon
- endif
- 
-