diff --git a/emulators/stella/Makefile.common b/emulators/stella/Makefile.common
index 6ef47c584ab7..4667e828c950 100644
--- a/emulators/stella/Makefile.common
+++ b/emulators/stella/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.5 2020/06/09 11:59:58 nia Exp $
+# $NetBSD: Makefile.common,v 1.6 2020/06/29 14:48:49 nia Exp $
 # used by emulators/stella/Makefile
 # used by emulators/libretro-stella/Makefile
 
-DISTNAME=	stella-6.2-src
+DISTNAME=	stella-6.2.1-src
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=stella-emu/}
 GITHUB_RELEASE=	${PKGVERSION_NOREV}
@@ -18,6 +18,6 @@ WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//1}
 USE_LANGUAGES=	c c++
 
 # c++14
-GCC_REQD+=	5
+GCC_REQD+=	6
 
 UNLIMIT_RESOURCES=	datasize
diff --git a/emulators/stella/distinfo b/emulators/stella/distinfo
index 7b1bc410f682..cb0a1d0dd788 100644
--- a/emulators/stella/distinfo
+++ b/emulators/stella/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.28 2020/06/09 11:59:58 nia Exp $
+$NetBSD: distinfo,v 1.29 2020/06/29 14:48:49 nia Exp $
 
-SHA1 (stella-6.2-src.tar.xz) = 3936d5ffbb870ae92cbfd27732632fdc543ccfce
-RMD160 (stella-6.2-src.tar.xz) = 5332be51144ae538b3a461e21b59df3cb860e23f
-SHA512 (stella-6.2-src.tar.xz) = 710b7980c1490c53e6a13ae99e56a089fb6d54b491332d8e7a81be182d06d6c5511cb2ff93791b3b94943266a52c2b0cc80080a64212e22ed1b6cf311c4277b4
-Size (stella-6.2-src.tar.xz) = 4239900 bytes
-SHA1 (patch-configure) = 4818245fe59c6c73e6d7647e7d3aed1f3c938c90
+SHA1 (stella-6.2.1-src.tar.xz) = 03508fdef44c003d15bbcd5fe8df4c7992e13d91
+RMD160 (stella-6.2.1-src.tar.xz) = a5ba66e6fa9cc672c314d1676d0270689da09123
+SHA512 (stella-6.2.1-src.tar.xz) = f6a8318db81da463cc10944228ac65f43d03823f50d9b2b37657e1c0161ee4d260226142acc9cbbf2fe4541b79a75856601bd44ac44e1f9f909ae11785f704ec
+Size (stella-6.2.1-src.tar.xz) = 4238636 bytes
diff --git a/emulators/stella/patches/patch-configure b/emulators/stella/patches/patch-configure
deleted file mode 100644
index c40851315de9..000000000000
--- a/emulators/stella/patches/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-configure,v 1.6 2019/09/08 20:04:54 dbj Exp $
-
-pkgsrc cwrappers add -stdc=c++14 which causes an error
-when using clang -x c, so instead use -x c++ which works.
-
---- configure.orig	2019-06-02 16:25:55.000000000 +0000
-+++ configure
-@@ -385,9 +385,9 @@ cc_check_define __GNUC__ && have_gcc=yes
- 
- if test "$have_clang" = yes; then
- 
--	clang_minor=$( $CXX -dM -E -x c /dev/null | grep __clang_minor__ | sed -E 's/.* ([0-9]+).*/\1/' )
--	clang_patch=$( $CXX -dM -E -x c /dev/null | grep __clang_patchlevel__ | sed -E 's/.* ([0-9]+).*/\1/' )
--	clang_major=$( $CXX -dM -E -x c /dev/null | grep __clang_major__ | sed -E 's/.* ([0-9]+).*/\1/' )
-+	clang_minor=$( $CXX -dM -E -x c++ /dev/null | grep __clang_minor__ | sed -E 's/.* ([0-9]+).*/\1/' )
-+	clang_patch=$( $CXX -dM -E -x c++ /dev/null | grep __clang_patchlevel__ | sed -E 's/.* ([0-9]+).*/\1/' )
-+	clang_major=$( $CXX -dM -E -x c++ /dev/null | grep __clang_major__ | sed -E 's/.* ([0-9]+).*/\1/' )
- 
- 	cxx_version="$clang_major.$clang_minor.$clang_patch"
-