diff --git a/emulators/spim/Makefile b/emulators/spim/Makefile
index b8f9529fc43..1a3d0186c1a 100644
--- a/emulators/spim/Makefile
+++ b/emulators/spim/Makefile
@@ -1,19 +1,20 @@
-# $OpenBSD: Makefile,v 1.3 2002/10/26 12:52:48 naddy Exp $
+# $OpenBSD: Makefile,v 1.4 2003/07/03 06:16:22 sturm Exp $
 
 COMMENT=	"MIPS R2000/R3000 simulator"
 
 DISTNAME=	spim
-PKGNAME=	spim-6.4
+PKGNAME=	spim-6.5
 CATEGORIES=	emulators
 
 HOMEPAGE=	http://www.cs.wisc.edu/~larus/spim.html
 
 MAINTAINER=	Kevin Lo <kevlo@openbsd.org>
 
-PERMIT_PACKAGE_CDROM=   Yes
-PERMIT_PACKAGE_FTP=     Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP=   Yes
+# homegrown, to be changed in next release
+PERMIT_PACKAGE_CDROM=   "may not sell"
+PERMIT_PACKAGE_FTP=     "may not bundle with commercial product"
+PERMIT_DISTFILES_CDROM= "may not sell"
+PERMIT_DISTFILES_FTP=   "may not bundle with commercial product"
 
 MASTER_SITES=	http://www.cs.wisc.edu/~larus/SPIM/
 
@@ -24,7 +25,8 @@ WRKDIST=	${WRKDIR}/${PKGNAME}
 
 ALL_TARGET=	spim xspim	
 
-NO_REGRESS=	Yes
+REGRESS_DEPENDS=::emulators/spim
+REGRESS_TARGET=	test
 
 DOCS=	spim.ps cycle.ps
 
diff --git a/emulators/spim/distinfo b/emulators/spim/distinfo
index ae3b3861ee6..c0b11402cec 100644
--- a/emulators/spim/distinfo
+++ b/emulators/spim/distinfo
@@ -1,3 +1,3 @@
-MD5 (spim.tar.gz) = 6d6546aae579866d05ccc0f2c2217733
-RMD160 (spim.tar.gz) = f55387cd7960c56d2f5ed82ff5f0ede8a1240fcd
-SHA1 (spim.tar.gz) = 0f7afa2e836ed8b28d3a3808c8aa6eb1b478dae3
+MD5 (spim.tar.gz) = be9cf6ff2798e507736d05eb5c70914f
+RMD160 (spim.tar.gz) = 92ee3e9dcc3bc27e5d2e1068f8adf605acdf68bc
+SHA1 (spim.tar.gz) = 7ebae8a3fe1a523d92c3ba99cb197f094046229c