diff --git a/emulators/catapult/Makefile b/emulators/catapult/Makefile
index e11a9804997c..374d85e2170a 100644
--- a/emulators/catapult/Makefile
+++ b/emulators/catapult/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	catapult
-PORTVERSION=	0.8.1
+PORTVERSION=	0.8.2
 CATEGORIES=	emulators
 MASTER_SITES=	SF/openmsx/openmsx/${PORTVERSION}
 DISTNAME=	openmsx-${PORTNAME}-${PORTVERSION}
@@ -15,11 +15,11 @@ DISTNAME=	openmsx-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GUI for openMSX
 
+LICENSE=	GPLv2
+
 BUILD_DEPENDS=	openmsx:${PORTSDIR}/emulators/openmsx
 RUN_DEPENDS=	openmsx:${PORTSDIR}/emulators/openmsx
 
-LICENSE=	GPLv2
-
 USE_GNOME=	libxml2
 USE_WX=		2.6+
 USE_PYTHON_BUILD=yes
@@ -50,9 +50,9 @@ CATAPULT_STRIP=	true
 post-patch:
 	@${REINPLACE_CMD} 's|INSTALL_BASE|INSTALL_SHARE_DIR|' \
 		${WRKSRC}/build/info2code.mk
-.for file in build/main.mk build/probe.mk
+.for FILE in build/main.mk build/probe.mk
 	@${REINPLACE_CMD} 's|@$$(CXX)|$$(CXX)| ; \
-		 s|wx-config|${WX_CONFIG}|g' ${WRKSRC}/${file}
+		 s|wx-config|${WX_CONFIG}|g' ${WRKSRC}/${FILE}
 .endfor
 	@${ECHO_CMD} > ${WRKSRC}/build/flavour-portbld.mk
 	@${ECHO_CMD} 'CXXFLAGS+=${CXXFLAGS}' \
diff --git a/emulators/catapult/distinfo b/emulators/catapult/distinfo
index c30031b3d485..b911ed65db6e 100644
--- a/emulators/catapult/distinfo
+++ b/emulators/catapult/distinfo
@@ -1,2 +1,2 @@
-SHA256 (openmsx-catapult-0.8.1.tar.gz) = ff6d18977727d2740f41cf983975f8439a644c1adc2648d5550793d46382a811
-SIZE (openmsx-catapult-0.8.1.tar.gz) = 1284236
+SHA256 (openmsx-catapult-0.8.2.tar.gz) = 9168b0c88d4d2a3b76691fd4b995f464de8365ec882f0ea3948a833ea783dddd
+SIZE (openmsx-catapult-0.8.2.tar.gz) = 1284311