diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile
index 68754bdf6fac..8cb3626e5a50 100644
--- a/multimedia/x264/Makefile
+++ b/multimedia/x264/Makefile
@@ -1,128 +1,128 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 #
 # NOTES FOR UPDATING PORT:
 #
 # We use tarballs from the *stable* branch of the upstream git repository.
 #
 # X264_BUILD is the "core" number, and can be found in x264.h.
 #
 # X264_REV requires a checkout the git revision for the version the port
 # is being updated to. Then run version.sh against it.
 #
 # Bumping PORTREVISION for dependent ports? This is useful:
 #   fgrep -lr --include='*/Makefile*' :multimedia/libx264 $PORTSDIR |
 #   sed 's,/Makefile.*,,' | xargs $PORTSDIR/Tools/scripts/bump-revision.sh
 # or
 #   rg -l :multimedia/libx264 $PORTSDIR | xargs -n1 portedit bump-revision -i
 
 PORTNAME=	x264
 PORTVERSION=	0.${X264_BUILD}.${X264_REV}
 PORTREVISION?=	0
 CATEGORIES=	multimedia
 MASTER_SITES=	https://samples.mplayerhq.hu/yuv4mpeg2/:pgo
 DIST_SUBDIR=	x264
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	koobs@FreeBSD.org
 COMMENT?=	H.264/MPEG-4 AVC Video Encoding (Front End CLI)
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS?=	libx264.so:multimedia/libx264
 
 X264_BUILD=	161
-X264_REV=	3039
+X264_REV=	3049
 X264_GITVER=	${GL_COMMIT:C/^(.{7}).*/\1/}
 
 USES?=		pkgconfig
 USES+=		compiler:c11 gmake localbase shebangfix
 USE_GITLAB=	yes
 USE_LDCONFIG=	yes
 GL_SITE=	https://code.videolan.org
 GL_ACCOUNT=	videolan
-GL_COMMIT=	544c61f082194728d0391fb280a6e138ba320a96
+GL_COMMIT=	55d517bc4569272a2c9a367a4106c234aba2ffbc
 HAS_CONFIGURE=	yes
 SHEBANG_FILES=	configure
 PLIST_FILES?=	bin/x264
 
 OPTIONS_DEFINE+=	BASH DEBUG FFMS LAVF PGO SWSCALE
 OPTIONS_RADIO+=		MP4
 OPTIONS_RADIO_MP4+=	GPAC LSMASH
 OPTIONS_DEFAULT+=	BASH FFMS LAVF LSMASH SWSCALE
 
 .if make(makesum) # for optional distfiles
 .MAKEFLAGS:	WITH="${OPTIONS_DEFINE}"
 .endif
 
 FFMS_DESC=		FFmpeg Source input support
 GPAC_DESC=		GPAC library support
 LAVF_DESC=		libav* format input support (requires FFmpeg)
 LSMASH_DESC=		L-SMASH library support
 MP4_DESC=		MPEG-4 output
 SWSCALE_DESC=		Resize video filter
 
 BASH_BUILD_DEPENDS=	bash-completion>0:shells/bash-completion
 BASH_RUN_DEPENDS=	bash-completion>0:shells/bash-completion
 BASH_CONFIGURE_ENABLE=	bashcompletion
 BASH_PLIST_FILES=	share/bash-completion/completions/x264
 
 DEBUG_CONFIGURE_ENABLE=	debug
 DEBUG_CONFIGURE_OFF=	--enable-strip
 
 FFMS_LIB_DEPENDS=	libffms2.so:multimedia/ffms2
 FFMS_CONFIGURE_ENABLE=	ffms
 FFMS_IMPLIES=		SWSCALE
 
 GPAC_LIB_DEPENDS=	libgpac.so:multimedia/gpac-libgpac
 GPAC_CONFIGURE_ENABLE=	gpac
 
 LAVF_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 			libavformat.so:multimedia/ffmpeg \
 			libavutil.so:multimedia/ffmpeg
 LAVF_CONFIGURE_ENABLE=	lavf
 LAVF_IMPLIES=		SWSCALE
 
 LSMASH_LIB_DEPENDS=	liblsmash.so:multimedia/l-smash
 LSMASH_CONFIGURE_ENABLE=lsmash
 
 PGO_DISTFILES=		${Y4M_VIDEO_DISTFILE}:pgo
 PGO_MAKE_ENV=		VIDS="${WRKDIR}/${Y4M_VIDEO}"
 PGO_ALL_TARGET=		fprofiled
 # y4m sample video
 Y4M_VIDEO=		example.y4m
 Y4M_VIDEO_DISTFILE=	example.y4m.bz2
 PGO_VARS=		USE_GCC=any \
 			RESTRICTED="${Y4M_VIDEO_DISTFILE} file may not be mirrored" \
 			RESTRICTED_FILES="${Y4M_VIDEO_DISTFILE}"
 
 SWSCALE_LIB_DEPENDS=	libavutil.so:multimedia/ffmpeg \
 			libswscale.so:multimedia/ffmpeg
 SWSCALE_CONFIGURE_ENABLE=	swscale
 
 CONFIGURE_ARGS?=	--system-libx264
 CONFIGURE_ARGS+=	--prefix="${PREFIX}" \
 			--extra-cflags="${CPPFLAGS} ${CFLAGS}" \
 			--extra-ldflags="${LDFLAGS}"
 
 post-extract-PGO-on:
 	@${BZIP2_CMD} -dc ${DISTDIR}/${DIST_SUBDIR}/${Y4M_VIDEO_DISTFILE} \
 		>${WRKDIR}/${Y4M_VIDEO}
 
 post-patch:
 	@${REINPLACE_CMD} -e ' \
 		s|gpac_static|gpac|g' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e ' \
 		s|bash|sh|; \
 		s|VER="x"|VER="${X264_REV} ${X264_GITVER}"|; \
 		s|VERSION=""|VERSION=" r${X264_REV} ${X264_GITVER}"|' \
 		${WRKSRC}/version.sh
 
 .if !target(pre-build)
 pre-build:
 	@(${RM} ${WRKSRC}/x264_config.h)
 .endif
 
 .include <bsd.port.mk>
diff --git a/multimedia/x264/distinfo b/multimedia/x264/distinfo
index efb5bb8098ab..60acc7895a40 100644
--- a/multimedia/x264/distinfo
+++ b/multimedia/x264/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1617891586
+TIMESTAMP = 1618210496
 SHA256 (x264/example.y4m.bz2) = a5bec9d37362bd9d7773fbd0644643f9ec096d654d20823004e88d5df32bbff7
 SIZE (x264/example.y4m.bz2) = 4910029
-SHA256 (x264/videolan-x264-544c61f082194728d0391fb280a6e138ba320a96_GL0.tar.gz) = 40e26ebf46868fc3facd954a9282ed518d056dabe0ae6f80327d6156afd2d0a0
-SIZE (x264/videolan-x264-544c61f082194728d0391fb280a6e138ba320a96_GL0.tar.gz) = 936949
+SHA256 (x264/videolan-x264-55d517bc4569272a2c9a367a4106c234aba2ffbc_GL0.tar.gz) = 463946031aa3dc507940e988c78ef02d2eb1769043877c17923ad9411b13af5b
+SIZE (x264/videolan-x264-55d517bc4569272a2c9a367a4106c234aba2ffbc_GL0.tar.gz) = 937106
diff --git a/multimedia/x264/files/patch-Makefile b/multimedia/x264/files/patch-Makefile
deleted file mode 100644
index 4ddae76c6834..000000000000
--- a/multimedia/x264/files/patch-Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
--T (treat DEST as a normal file) is not supported by BSD install(1)
-
---- Makefile.orig	2020-09-12 17:23:57 UTC
-+++ Makefile
-@@ -413,7 +413,7 @@ endif
- install-bashcompletion:
- ifneq ($(BASHCOMPLETIONSDIR),)
- 	$(INSTALL) -d $(DESTDIR)$(BASHCOMPLETIONSDIR)
--	$(INSTALL) -m 644 -T $(SRCPATH)/tools/bash-autocomplete.sh $(DESTDIR)$(BASHCOMPLETIONSDIR)/x264
-+	$(INSTALL) -m 644 $(SRCPATH)/tools/bash-autocomplete.sh $(DESTDIR)$(BASHCOMPLETIONSDIR)/x264
- endif
- 
- uninstall: