diff --git a/audio/praat/Makefile b/audio/praat/Makefile
index e6f6a9a1bdca..64be6d901a2d 100644
--- a/audio/praat/Makefile
+++ b/audio/praat/Makefile
@@ -1,59 +1,59 @@
 # $FreeBSD$
 
 PORTNAME=		praat
 DISTVERSIONPREFIX=	v
-DISTVERSION=		6.1.16
+DISTVERSION=		6.1.22
 CATEGORIES=		audio science
 
 MAINTAINER=	adridg@FreeBSD.org
 COMMENT=	Phonetics by Computer
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libjack.so:audio/jack \
 		libasound.so:audio/alsa-lib
 
 USES=		compiler:c++11-lang dos2unix gnome iconv pkgconfig
 USE_GNOME=	cairo gdkpixbuf2 gtk20
 USE_GITHUB=	yes
 
 DOS2UNIX_REGEX=	.*Makefile
 PLIST_FILES=	bin/praat man/man1/praat.1.gz
 
 HARDCPPFLAGS=	${WRKSRC}/EEG/Makefile \
 		${WRKSRC}/FFNet/Makefile \
 		${WRKSRC}/LPC/Makefile \
 		${WRKSRC}/artsynth/Makefile \
 		${WRKSRC}/dwsys/Makefile \
 		${WRKSRC}/dwtools/Makefile \
 		${WRKSRC}/external/espeak/Makefile \
 		${WRKSRC}/external/flac/Makefile \
 		${WRKSRC}/external/gsl/Makefile \
 		${WRKSRC}/external/mp3/Makefile \
 		${WRKSRC}/fon/Makefile \
 		${WRKSRC}/gram/Makefile \
 		${WRKSRC}/kar/Makefile \
 		${WRKSRC}/main/Makefile \
 		${WRKSRC}/melder/Makefile \
 		${WRKSRC}/stat/Makefile \
 		${WRKSRC}/sys/Makefile
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|^CPPFLAGS =|CPPFLAGS +=|' ${HARDCPPFLAGS}
 	@${CP} ${FILESDIR}/makefile.defs.freebsd.alsa \
 		${WRKSRC}/makefile.defs
 	@${REINPLACE_CMD} -e 's|%%WRKSRC%%|${WRKSRC}|g' \
 			  -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/makefile.defs
 	@${REINPLACE_CMD} -e 's| log2| NUMlog2|g' \
 			  -e 's|feof (f)|feof (f.get_ptr())|g' \
 			  -e 's|ferror (f)|ferror (f.get_ptr())|g' \
 		${WRKSRC}/dwtools/Sound_extensions.cpp
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/praat ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${FILESDIR}/praat.1 ${STAGEDIR}${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/audio/praat/distinfo b/audio/praat/distinfo
index 225b8ba362b3..40f2f8c421b4 100644
--- a/audio/praat/distinfo
+++ b/audio/praat/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1591555611
-SHA256 (praat-praat-v6.1.16_GH0.tar.gz) = 84b4aa52ece20f7318aa9b5aa03718d074c492cf1998df65e7d128444a0d45d1
-SIZE (praat-praat-v6.1.16_GH0.tar.gz) = 31059591
+TIMESTAMP = 1601119435
+SHA256 (praat-praat-v6.1.22_GH0.tar.gz) = 046917fd84c8acb0c4d35cac4157d9a6d0b3fad112f1b08b14d57185cd0f88cd
+SIZE (praat-praat-v6.1.22_GH0.tar.gz) = 31411295
diff --git a/audio/praat/files/patch-git-dcaf03d1f0d6d12689f604347d169bfc732af69a.diff b/audio/praat/files/patch-git-dcaf03d1f0d6d12689f604347d169bfc732af69a.diff
new file mode 100644
index 000000000000..7c58e5aecf1c
--- /dev/null
+++ b/audio/praat/files/patch-git-dcaf03d1f0d6d12689f604347d169bfc732af69a.diff
@@ -0,0 +1,21 @@
+From dcaf03d1f0d6d12689f604347d169bfc732af69a Mon Sep 17 00:00:00 2001
+From: David Lukes <dafydd.lukes@gmail.com>
+Date: Thu, 27 Aug 2020 12:57:27 +0200
+Subject: [PATCH] Fix #199
+
+---
+ sys/praat.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/sys/praat.cpp b/sys/praat.cpp
+index 4c359e012..4f57f16b4 100644
+--- sys/praat.cpp
++++ sys/praat.cpp
+@@ -1078,6 +1078,7 @@ void praat_init (conststring32 title, int argc, char **argv)
+ 	while (praatP.argumentNumber < argc && argv [praatP.argumentNumber] [0] == '-') {
+ 		if (strequ (argv [praatP.argumentNumber], "-")) {
+ 			praatP.hasCommandLineInput = true;
++			praatP.argumentNumber += 1;
+ 		} else if (strequ (argv [praatP.argumentNumber], "--open")) {
+ 			foundTheOpenOption = true;
+ 			praatP.argumentNumber += 1;