diff --git a/graphics/tkimg/Makefile b/graphics/tkimg/Makefile
index 96f180419c5..f12bfaa4b00 100644
--- a/graphics/tkimg/Makefile
+++ b/graphics/tkimg/Makefile
@@ -1,18 +1,22 @@
 COMMENT =		image extension for Tcl/Tk
 
-V =			2.0.1
+V =			2.1.0
 
 DISTNAME =		Img-${V}
 PKGNAME =		tkimg-${V}
+
 CATEGORIES =		graphics
 HOMEPAGE = 		https://tkimg.sourceforge.net/
 MAINTAINER =		Stuart Cassoff <stwo@users.sourceforge.net>
 
 # BSD
 PERMIT_PACKAGE =	Yes
+
 WANTLIB =		X11 Xext Xft Xss fontconfig freetype m z
+
 SITES =			${SITE_SOURCEFORGE:=tkimg/}
 FIX_CRLF_FILES =	${EXA_SRCS}
+
 MODULES =		x11/tk
 MODTK_VERSION =		8.6
 
@@ -24,7 +28,6 @@ RUN_DEPENDS =		${MODTK_RUN_DEPENDS}
 FAKE_FLAGS =		INSTALL_ROOT=${DESTDIR} \
 			LIB_RUNTIME_DIR=${MODTCL_TCLDIR}/tkimg
 
-#TEST_FLAGS =		libdir=${WRKBUILD}
 SEPARATE_BUILD =	Yes
 CONFIGURE_STYLE =	gnu
 
@@ -34,15 +37,17 @@ CONFIGURE_ARGS =	--libdir=${MODTCL_TCLDIR}/tkimg \
 			--with-tk=${MODTK_LIBDIR} \
 			--with-x
 
+TEST_ENV =		TCLLIBPATH=${WRKBUILD}
+TEST_FLAGS =		${TESTFLAGS}
 TEST_IS_INTERACTIVE =	X11
+
 WRKDIST =		${WRKDIR}/Img-${V}
 INSTALL_TARGET =	install-libraries install-man
-TEST_TARGET =		test
-SUBST_VARS =		IMG_VER JPG_VER PNG_VER TIFF_VER ZLIB_VER
 
+SUBST_VARS =		IMG_VER JPG_VER PNG_VER TIFF_VER ZLIB_VER
 IMG_VER =		${V:S/.//g}
 JPG_VER =		960
-PNG_VER =		1644
+PNG_VER =		1648
 TIFF_VER =		470
 ZLIB_VER =		131
 
@@ -50,8 +55,8 @@ EXA_SRC_DIR =		${WRKSRC}/tests/demo
 EXA_DEST_DIR =		${PREFIX}/share/examples/tkimg
 EXA_SRCS =		${EXA_SRC_DIR}/{demo,tkv}.tcl
 
-# Tests are broken
-NO_TEST =		Yes
+# Use TESTFLAGS to control the Img tests
+TESTFLAGS =
 
 pre-configure:
 	@${MODTCL_WISH_ADJ} ${EXA_SRCS}
@@ -61,4 +66,8 @@ post-install:
 	${INSTALL_SCRIPT} ${EXA_SRCS} ${EXA_DEST_DIR}
 	${INSTALL_DATA} ${EXA_SRC_DIR}/msgs/* ${EXA_DEST_DIR}/msgs/
 
+do-test:
+	@cd ${WRKSRC}/tests && env -i ${ALL_TEST_ENV} \
+	    ${MODTCL_BIN} all.tcl ${TEST_FLAGS} ${TEST_LOG}
+
 .include <bsd.port.mk>
diff --git a/graphics/tkimg/distinfo b/graphics/tkimg/distinfo
index 751b5bc4828..dfb5697af05 100644
--- a/graphics/tkimg/distinfo
+++ b/graphics/tkimg/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Img-2.0.1.tar.gz) = 5p0xs/Q5oZBx41CKeYudXccLlBbgCSbNrBLBwtUPzoM=
-SIZE (Img-2.0.1.tar.gz) = 12312476
+SHA256 (Img-2.1.0.tar.gz) = mChrX0rlfhxzcFrFoI7eVERLYQMpJB7ME+mdYM5ccJU=
+SIZE (Img-2.1.0.tar.gz) = 12335560