diff --git a/www/youtube_dl/Makefile b/www/youtube_dl/Makefile
index 70bc68026475..a167bb31e173 100644
--- a/www/youtube_dl/Makefile
+++ b/www/youtube_dl/Makefile
@@ -1,44 +1,40 @@
 PORTNAME=	youtube_dl
-DISTVERSION=	2021.12.17
+PORTVERSION=	2023.03.14
 CATEGORIES=	www
-MASTER_SITES=	https://github.com/ytdl-org/youtube-dl/releases/download/${DISTVERSION}/ \
-		https://yt-dl.org/downloads/${DISTVERSION}/
-DISTNAME=	youtube-dl-${DISTVERSION}
 
 # Implicit approval to commit trivial version updates.
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Program for downloading videos from various services
 WWW=		https://yt-dl.org/
 
 LICENSE=	UNLICENSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-DEPRECATED=	Unmaintained upstream, www/yt-dlp can be used going forward
-EXPIRATION_DATE=2023-03-31
+BUILD_DEPENDS=	pandoc:textproc/hs-pandoc
 
 USES=		gmake python
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	ytdl-org
+GH_PROJECT=	youtube-dl
+GH_TAGNAME=	6fece0a
+
 MAKE_ARGS=	PYTHON=${PYTHON_CMD}
 ALL_TARGET=	youtube-dl
 NO_ARCH=	yes
-WRKSRC=		${WRKDIR}/youtube-dl
 
 PLIST_FILES=	bin/youtube-dl \
 		etc/bash_completion.d/youtube-dl.sh \
 		man/man1/youtube-dl.1.gz \
 		share/fish/vendor_completions.d/youtube-dl.fish \
 		share/zsh/site-functions/_youtube-dl
 
 OPTIONS_DEFINE=		FFMPEG RTMPDUMP
 OPTIONS_DEFAULT=	RTMPDUMP
 
 RTMPDUMP_DESC=	Use rtmpdump to download rtmp video streams
 
 FFMPEG_RUN_DEPENDS=	ffprobe:multimedia/ffmpeg
 RTMPDUMP_RUN_DEPENDS=	rtmpdump:multimedia/rtmpdump
 
-post-extract:
-# remove tarball provided version, build our own
-	@${RM} ${WRKSRC}/youtube-dl
-
 .include <bsd.port.mk>
diff --git a/www/youtube_dl/distinfo b/www/youtube_dl/distinfo
index 32eb9ce55533..0c54f5e88d1d 100644
--- a/www/youtube_dl/distinfo
+++ b/www/youtube_dl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639680444
-SHA256 (youtube-dl-2021.12.17.tar.gz) = 9f3b99c8b778455165b4525f21505e86c7ff565f3ac319e19733d810194135df
-SIZE (youtube-dl-2021.12.17.tar.gz) = 3332299
+TIMESTAMP = 1679299345
+SHA256 (ytdl-org-youtube-dl-2023.03.14-6fece0a_GH0.tar.gz) = e6a57710bde2e7d137f28a6e829834281f2f0470675f99dcb9182088533aaa46
+SIZE (ytdl-org-youtube-dl-2023.03.14-6fece0a_GH0.tar.gz) = 1638794
diff --git a/www/youtube_dl/files/patch-Makefile b/www/youtube_dl/files/patch-Makefile
index d88e1149d60a..8ac0bb1eed00 100644
--- a/www/youtube_dl/files/patch-Makefile
+++ b/www/youtube_dl/files/patch-Makefile
@@ -1,47 +1,35 @@
---- Makefile.orig	2019-12-24 22:21:59.865317000 +0100
-+++ Makefile	2019-12-24 22:24:39.962172000 +0100
-@@ -12,7 +12,7 @@
+--- Makefile.orig	2023-03-14 16:23:20 UTC
++++ Makefile
+@@ -12,7 +12,7 @@ SHAREDIR ?= $(PREFIX)/share
  PYTHON ?= /usr/bin/env python
  
  # set SYSCONFDIR to /etc if PREFIX=/usr or PREFIX=/usr/local
 -SYSCONFDIR = $(shell if [ $(PREFIX) = /usr -o $(PREFIX) = /usr/local ]; then echo /etc; else echo $(PREFIX)/etc; fi)
 +SYSCONFDIR ?= $(PREFIX)/etc
  
  # set markdown input format to "markdown-smart" for pandoc version 2 and to "markdown" for pandoc prior to version 2
  MARKDOWN = $(shell if [ `pandoc -v | head -n1 | cut -d" " -f2 | head -c1` = "2" ]; then echo markdown-smart; else echo markdown; fi)
-@@ -23,11 +23,11 @@
+@@ -23,11 +23,11 @@ install: youtube-dl youtube-dl.1 youtube-dl.bash-compl
  	install -d $(DESTDIR)$(MANDIR)/man1
  	install -m 644 youtube-dl.1 $(DESTDIR)$(MANDIR)/man1
  	install -d $(DESTDIR)$(SYSCONFDIR)/bash_completion.d
 -	install -m 644 youtube-dl.bash-completion $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/youtube-dl
 +	install -m 644 youtube-dl.bash-completion $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/youtube-dl.sh
  	install -d $(DESTDIR)$(SHAREDIR)/zsh/site-functions
  	install -m 644 youtube-dl.zsh $(DESTDIR)$(SHAREDIR)/zsh/site-functions/_youtube-dl
 -	install -d $(DESTDIR)$(SYSCONFDIR)/fish/completions
 -	install -m 644 youtube-dl.fish $(DESTDIR)$(SYSCONFDIR)/fish/completions/youtube-dl.fish
 +	install -d $(DESTDIR)$(SHAREDIR)/fish/vendor_completions.d
 +	install -m 644 youtube-dl.fish $(DESTDIR)$(SHAREDIR)/fish/vendor_completions.d/youtube-dl.fish
  
  codetest:
  	flake8 .
-@@ -65,7 +65,7 @@
+@@ -65,7 +65,7 @@ youtube-dl: youtube_dl/*.py youtube_dl/*/*.py
  	done
  	touch -t 200001010101 zip/youtube_dl/*.py zip/youtube_dl/*/*.py
  	mv zip/youtube_dl/__main__.py zip/
 -	cd zip ; zip -q ../youtube-dl youtube_dl/*.py youtube_dl/*/*.py __main__.py
 +	cd zip ; bsdtar -a -cf ../youtube-dl.zip youtube_dl/*.py youtube_dl/*/*.py __main__.py
  	rm -rf zip
  	echo '#!$(PYTHON)' > youtube-dl
  	cat youtube-dl.zip >> youtube-dl
-@@ -90,11 +90,6 @@
- 
- README.txt: README.md
- 	pandoc -f $(MARKDOWN) -t plain README.md -o README.txt
--
--youtube-dl.1: README.md
--	$(PYTHON) devscripts/prepare_manpage.py youtube-dl.1.temp.md
--	pandoc -s -f $(MARKDOWN) -t man youtube-dl.1.temp.md -o youtube-dl.1
--	rm -f youtube-dl.1.temp.md
- 
- youtube-dl.bash-completion: youtube_dl/*.py youtube_dl/*/*.py devscripts/bash-completion.in
- 	$(PYTHON) devscripts/bash-completion.py