diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -1,8 +1,7 @@
 PORTNAME=	xscreensaver
-DISTVERSION=	6.05
+DISTVERSION=	6.06
 CATEGORIES=	x11
 MASTER_SITES=	http://www.jwz.org/xscreensaver/
-EXTRACT_SUFX=	.1.tar.gz
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Save your screen while you entertain your cat
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1669032437
-SHA256 (xscreensaver-6.05.1.tar.gz) = 2da512b201cacc85c496f602e73947da4e89bfb5bb67a74e65e052fd5e677b3a
-SIZE (xscreensaver-6.05.1.tar.gz) = 26110057
+TIMESTAMP = 1671446342
+SHA256 (xscreensaver-6.06.tar.gz) = f534fab85a836de5b8be8e91fc21b80ca7d6a4ed9386ebe207d4be7a4e7499a7
+SIZE (xscreensaver-6.06.tar.gz) = 26334374
diff --git a/x11/xscreensaver/files/patch-configure.ac b/x11/xscreensaver/files/patch-configure.ac
--- a/x11/xscreensaver/files/patch-configure.ac
+++ b/x11/xscreensaver/files/patch-configure.ac
@@ -1,15 +1,6 @@
---- configure.ac.orig	2022-09-02 16:10:15 UTC
+--- configure.ac.orig	2022-12-19 10:45:37 UTC
 +++ configure.ac
-@@ -2822,7 +2822,7 @@ if test "$with_gtk" = yes; then
- 
-   GTK_DATADIR=""
-   if test "$have_gtk" = yes; then
--    GTK_DATADIR=`$pkg_config --variable=prefix gtk+-2.0`
-+    GTK_DATADIR=`$pkg_config --variable=prefix gtk+-3.0`
-     GTK_DATADIR="$GTK_DATADIR/share"
-   fi
- 
-@@ -4031,7 +4031,7 @@ fi
+@@ -4003,7 +4003,7 @@ fi
  ###############################################################################
  
  PTY_LIBS=
diff --git a/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in b/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in
--- a/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in
+++ b/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in
@@ -1,4 +1,4 @@
---- driver/XScreenSaver.ad.in.orig	2021-06-09 15:47:14 UTC
+--- driver/XScreenSaver.ad.in.orig	2022-12-11 20:32:55 UTC
 +++ driver/XScreenSaver.ad.in
 @@ -55,7 +55,7 @@
  *splashDuration:	0:00:05
@@ -8,7 +8,7 @@
 +*ignoreUninstalledPrograms: True
  *authWarningSlack:	20
  
- *textMode:		file
+ *textMode:		url
 @@ -103,7 +103,7 @@
  
  
@@ -34,10 +34,10 @@
 +                                  -label -origin moon			    \n\
 +-				xsnow -bg SkyBlue3 -solidbg		    \n\
 +@GL_KLUDGE@ GL:					fireflies -root                             \n\
- 				maze -root				    \n\
- @GL_KLUDGE@ GL: 				superquadrics -root			    \n\
- 				attraction -root			    \n\
-@@ -602,7 +614,6 @@ XScreenSaver.bourneShell:		/bin/sh
+ 				maze --root				    \n\
+ @GL_KLUDGE@ GL: 				superquadrics --root			    \n\
+ 				attraction --root			    \n\
+@@ -610,7 +622,6 @@ XScreenSaver.bourneShell:		/bin/sh
  *hacks.dangerball.name:     Danger Ball
  *hacks.decayscreen.name:    Decay Screen
  *hacks.deepstars.name:      Deep Stars
diff --git a/x11/xscreensaver/pkg-plist b/x11/xscreensaver/pkg-plist
--- a/x11/xscreensaver/pkg-plist
+++ b/x11/xscreensaver/pkg-plist
@@ -115,6 +115,7 @@
 bin/xscreensaver-hacks/helix
 bin/xscreensaver-hacks/hexadrop
 bin/xscreensaver-hacks/hexstrut
+bin/xscreensaver-hacks/hextrail
 bin/xscreensaver-hacks/hilbert
 bin/xscreensaver-hacks/hopalong
 bin/xscreensaver-hacks/hydrostat
@@ -229,7 +230,6 @@
 bin/xscreensaver-hacks/swirl
 bin/xscreensaver-hacks/tangram
 bin/xscreensaver-hacks/tessellimage
-bin/xscreensaver-hacks/thornbird
 bin/xscreensaver-hacks/timetunnel
 bin/xscreensaver-hacks/topblock
 bin/xscreensaver-hacks/triangle
@@ -386,6 +386,7 @@
 man/man6/helix.6.gz
 man/man6/hexadrop.6.gz
 man/man6/hexstrut.6.gz
+man/man6/hextrail.6.gz
 man/man6/hilbert.6.gz
 man/man6/hopalong.6.gz
 man/man6/hydrostat.6.gz
@@ -490,7 +491,6 @@
 man/man6/swirl.6.gz
 man/man6/tangram.6.gz
 man/man6/tessellimage.6.gz
-man/man6/thornbird.6.gz
 man/man6/timetunnel.6.gz
 man/man6/topblock.6.gz
 man/man6/triangle.6.gz
@@ -666,6 +666,7 @@
 %%DATADIR%%/config/helix.xml
 %%DATADIR%%/config/hexadrop.xml
 %%DATADIR%%/config/hexstrut.xml
+%%DATADIR%%/config/hextrail.xml
 %%DATADIR%%/config/hilbert.xml
 %%DATADIR%%/config/hopalong.xml
 %%DATADIR%%/config/hydrostat.xml
@@ -772,7 +773,6 @@
 %%DATADIR%%/config/swirl.xml
 %%DATADIR%%/config/tangram.xml
 %%DATADIR%%/config/tessellimage.xml
-%%DATADIR%%/config/thornbird.xml
 %%DATADIR%%/config/timetunnel.xml
 %%DATADIR%%/config/topblock.xml
 %%DATADIR%%/config/triangle.xml