diff --git a/emulators/vmips/Makefile b/emulators/vmips/Makefile
index 45f23f9892a5..8c7ec21009f6 100644
--- a/emulators/vmips/Makefile
+++ b/emulators/vmips/Makefile
@@ -1,20 +1,22 @@
 PORTNAME=	vmips
 PORTVERSION=	1.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	SF \
 		http://www.dgate.org/vmips/releases/${DISTNAME}/
 
 MAINTAINER=	brg@dgate.org
 COMMENT=	MIPS R3000 simulator
 WWW=		http://www.dgate.org/vmips/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		gmake
 GNU_CONFIGURE=	yes
+USE_CSTD=	gnu99
+USE_CXXSTD=	gnu++98
 
 INFO=		vmips
 
 .include <bsd.port.mk>
diff --git a/emulators/vmips/files/patch-vmips.cc b/emulators/vmips/files/patch-vmips.cc
new file mode 100644
index 000000000000..10c31ef29fc3
--- /dev/null
+++ b/emulators/vmips/files/patch-vmips.cc
@@ -0,0 +1,24 @@
+--- vmips.cc.orig	2013-05-25 22:21:31 UTC
++++ vmips.cc
+@@ -591,9 +591,11 @@ vmips::run()
+ 	return 0;
+ }
+ 
++#if 0
+ static void vmips_unexpected() {
+   fatal_error ("unexpected exception");
+ }
++#endif
+ 
+ static void vmips_terminate() {
+   fatal_error ("uncaught exception");
+@@ -602,7 +604,9 @@ static void vmips_terminate() {
+ int
+ main(int argc, char **argv)
+ try {
++#if 0
+ 	std::set_unexpected(vmips_unexpected);
++#endif
+ 	std::set_terminate(vmips_terminate);
+ 
+ 	machine = new vmips(argc, argv);