diff --git a/MOVED b/MOVED
index 0a258d59087e..18821df7ae50 100644
--- a/MOVED
+++ b/MOVED
@@ -16397,3 +16397,4 @@ databases/postgresql95-server||2021-06-13|Has expired: PostgreSQL-9.5 has reache
 databases/pg_reorg||2021-06-13|Removed, abandonware only for PostgreSQL 9.5
 databases/pgespresso||2021-06-13|Removed, functionality part of PostgreSQL 9.6 and later.
 x11-fonts/urw-core35-fonts|x11-fonts/urw-base35-fonts|2021-06-15|Project was renamed upstream
+graphics/jpeg-xl|graphics/libjxl|2021-06-16|Project was renamed upstream
diff --git a/graphics/Makefile b/graphics/Makefile
index 90aa7b6249f5..f809b7d1d394 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -375,7 +375,6 @@
     SUBDIR += jp2a
     SUBDIR += jpatch
     SUBDIR += jpeg-turbo
-    SUBDIR += jpeg-xl
     SUBDIR += jpeginfo
     SUBDIR += jpegoptim
     SUBDIR += jpgtn
@@ -460,6 +459,7 @@
     SUBDIR += libimg
     SUBDIR += libiptcdata
     SUBDIR += libjpeg-turbo
+    SUBDIR += libjxl
     SUBDIR += libjxr
     SUBDIR += libkdcraw
     SUBDIR += libkexiv2
diff --git a/graphics/jpeg-xl/Makefile b/graphics/libjxl/Makefile
similarity index 95%
rename from graphics/jpeg-xl/Makefile
rename to graphics/libjxl/Makefile
index 6ad1e2615b55..5654652546fd 100644
--- a/graphics/jpeg-xl/Makefile
+++ b/graphics/libjxl/Makefile
@@ -1,4 +1,4 @@
-PORTNAME=	jpeg-xl
+PORTNAME=	libjxl
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.3.7
 PORTREVISION=	2
@@ -16,16 +16,13 @@ LIB_DEPENDS=	libbrotlienc.so:archivers/brotli
 TEST_DEPENDS=	googletest>0:devel/googletest
 
 USES=		cmake:testing compiler:c++11-lib localbase:ldflags pkgconfig shared-mime-info
-USE_GITHUB=	nodefault
-USE_GITLAB=	yes
+USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 GH_TUPLE=	barmco:skcms:6437475:skcms/third_party/skcms \
 		google:highway:0.11.1:highway/third_party/highway \
 		lvandeve:lodepng:48e5364:lodepng/third_party/lodepng \
 		webmproject:sjpeg:868ab55:sjpeg/third_party/sjpeg \
 		${NULL}
-GL_ACCOUNT=	wg1
-GL_COMMIT=	9e9bce86164dc4d01c39eeeb3404d6aed85137b2
 CMAKE_ON=	JPEGXL_ENABLE_PLUGINS
 CMAKE_OFF=	JPEGXL_WARNINGS_AS_ERRORS ${BENCHMARK FUZZERS TCMALLOC:L:S/^/JPEGXL_ENABLE_/}
 CMAKE_OFF+=	${OpenGL GLUT:L:S/^/CMAKE_DISABLE_FIND_PACKAGE_/} # sjpeg
diff --git a/graphics/jpeg-xl/distinfo b/graphics/libjxl/distinfo
similarity index 72%
rename from graphics/jpeg-xl/distinfo
rename to graphics/libjxl/distinfo
index 7d0cea490819..1b5ffd1cedee 100644
--- a/graphics/jpeg-xl/distinfo
+++ b/graphics/libjxl/distinfo
@@ -1,4 +1,6 @@
-TIMESTAMP = 1617891487
+TIMESTAMP = 1617017470
+SHA256 (libjxl-libjxl-v0.3.7_GH0.tar.gz) = 8318a5d1ce82e5683a52512b6f242d2b33a1191e89fc76f7c0ead0a1d60f6c60
+SIZE (libjxl-libjxl-v0.3.7_GH0.tar.gz) = 14563688
 SHA256 (barmco-skcms-6437475_GH0.tar.gz) = 6818ea7aa053a964d1795d6d1d3c5e2aad5d30dff9817c8e604e324ef643ec01
 SIZE (barmco-skcms-6437475_GH0.tar.gz) = 9200034
 SHA256 (google-highway-0.11.1_GH0.tar.gz) = 4c4bb9501c02b27a0944afde8923aaab554384690d37e5b2a7f97553426ea641
@@ -7,5 +9,3 @@ SHA256 (lvandeve-lodepng-48e5364_GH0.tar.gz) = 41e0bcc686e31ee2d51a6c87c0089045f
 SIZE (lvandeve-lodepng-48e5364_GH0.tar.gz) = 239988
 SHA256 (webmproject-sjpeg-868ab55_GH0.tar.gz) = ffe757b376fed2fd94473f8625c25f82a3a23aa317fb1bbf1ac8159b6e0a7726
 SIZE (webmproject-sjpeg-868ab55_GH0.tar.gz) = 2472084
-SHA256 (wg1-jpeg-xl-9e9bce86164dc4d01c39eeeb3404d6aed85137b2_GL0.tar.gz) = 2b46a2cfccb5816ece3a11ae8dbbff724ba2bd2f75a25ef4f77b2558350f883f
-SIZE (wg1-jpeg-xl-9e9bce86164dc4d01c39eeeb3404d6aed85137b2_GL0.tar.gz) = 14564074
diff --git a/graphics/jpeg-xl/files/patch-private-libs b/graphics/libjxl/files/patch-private-libs
similarity index 96%
rename from graphics/jpeg-xl/files/patch-private-libs
rename to graphics/libjxl/files/patch-private-libs
index ed29440f14ef..4da786d74277 100644
--- a/graphics/jpeg-xl/files/patch-private-libs
+++ b/graphics/libjxl/files/patch-private-libs
@@ -1,5 +1,5 @@
 highway is untagged and have no other consumers. Keep it private to
-jpeg-xl package for now.
+libjxl package for now.
 
 --- third_party/CMakeLists.txt.orig	2020-11-14 00:52:03 UTC
 +++ third_party/CMakeLists.txt
diff --git a/graphics/jpeg-xl/pkg-descr b/graphics/libjxl/pkg-descr
similarity index 100%
rename from graphics/jpeg-xl/pkg-descr
rename to graphics/libjxl/pkg-descr
diff --git a/graphics/jpeg-xl/pkg-plist b/graphics/libjxl/pkg-plist
similarity index 100%
rename from graphics/jpeg-xl/pkg-plist
rename to graphics/libjxl/pkg-plist