diff --git a/databases/squirrel-sql/Makefile b/databases/squirrel-sql/Makefile
index f943df2fb43d2..25a979cb67956 100644
--- a/databases/squirrel-sql/Makefile
+++ b/databases/squirrel-sql/Makefile
@@ -1,7 +1,7 @@
 # Created by: Roy Boerner
 
 PORTNAME=	squirrel-sql
-PORTVERSION=	4.3.0
+PORTVERSION=	4.4.0
 CATEGORIES=	databases java
 MASTER_SITES=	SF/${PORTNAME}/1-stable/${PORTVERSION}-plainzip
 DISTNAME=	squirrelsql-${PORTVERSION}-optional
@@ -12,13 +12,7 @@ COMMENT=	Universal SQL Client
 LICENSE=	GPLv2
 
 USES=		zip
-
 USE_JAVA=	11+
-NO_BUILD=	yes
-NO_ARCH=	yes
-WRKSRC=		${WRKDIR}/${DISTNAME}
-
-SUB_FILES=	squirrel-sql
 
 DATADIR=	${PREFIX}/share/java/${PKGBASE}
 
@@ -28,6 +22,12 @@ DESKTOP_ENTRIES="Squirrel-SQL Client" \
 		"squirrel-sql" \
 		"Development;Database;Java;" \
 		false
+NO_ARCH=	yes
+NO_BUILD=	yes
+
+SUB_FILES=	squirrel-sql
+
+WRKSRC=		${WRKDIR}/${DISTNAME}
 
 post-extract:
 	cd "${WRKSRC}" && ${RM} -r *.bat *.sh icons/acorn.png.bak.png mac squirrelcli
diff --git a/databases/squirrel-sql/distinfo b/databases/squirrel-sql/distinfo
index 47c31ec0cedb6..ba981064bb3e9 100644
--- a/databases/squirrel-sql/distinfo
+++ b/databases/squirrel-sql/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1649462396
-SHA256 (squirrelsql-4.3.0-optional.zip) = 74888b0223949e8efe55fb24d8872df6986ea0c361d6a5fbf4c74cf86d42c13a
-SIZE (squirrelsql-4.3.0-optional.zip) = 59972791
+TIMESTAMP = 1655157021
+SHA256 (squirrelsql-4.4.0-optional.zip) = 259a338c61a86b16662ff004650866dcb6912a67a12e5402b8a83f34db81ced6
+SIZE (squirrelsql-4.4.0-optional.zip) = 56268471
diff --git a/databases/squirrel-sql/pkg-plist b/databases/squirrel-sql/pkg-plist
index f3812f748107c..f9d06b0a48148 100644
--- a/databases/squirrel-sql/pkg-plist
+++ b/databases/squirrel-sql/pkg-plist
@@ -81,11 +81,9 @@ bin/squirrel-sql
 %%DATADIR%%/icons/acorn.png
 %%DATADIR%%/icons/acorn.xpm
 %%DATADIR%%/icons/splash.jpg
-%%DATADIR%%/lib/RText.jar
 %%DATADIR%%/lib/antlr.jar
 %%DATADIR%%/lib/asm-attrs.jar
 %%DATADIR%%/lib/asm.jar
-%%DATADIR%%/lib/autocomplete-3.1.0.jar
 %%DATADIR%%/lib/axis-jaxrpc.jar
 %%DATADIR%%/lib/axis-saaj.jar
 %%DATADIR%%/lib/axis-wsdl4j.jar
@@ -98,7 +96,7 @@ bin/squirrel-sql
 %%DATADIR%%/lib/commons-discovery.jar
 %%DATADIR%%/lib/commons-httpclient.jar
 %%DATADIR%%/lib/commons-lang.jar
-%%DATADIR%%/lib/commons-logging.jar
+%%DATADIR%%/lib/commons-logging-1.2.jar
 %%DATADIR%%/lib/dom4j-2.1.3.jar
 %%DATADIR%%/lib/forms.jar
 %%DATADIR%%/lib/hibernate-annotations.jar
@@ -111,19 +109,21 @@ bin/squirrel-sql
 %%DATADIR%%/lib/java-diff-utils-4.5.jar
 %%DATADIR%%/lib/javahelp.jar
 %%DATADIR%%/lib/javax.activation.jar
-%%DATADIR%%/lib/jfreechart-1.5.0.jar
-%%DATADIR%%/lib/jgit5.6.0.201912101111-r-with-dependencies.jar
+%%DATADIR%%/lib/jfreechart-1.5.3.jar
+%%DATADIR%%/lib/jgit6.0.0.202111291000-r-with-dependencies.jar
 %%DATADIR%%/lib/jide-oss.jar
 %%DATADIR%%/lib/jmeld-3.4.0-jar-with-some-dependencies.jar
-%%DATADIR%%/lib/jsqlparser-3.3-SNAPSHOT.jar
-%%DATADIR%%/lib/log4j.jar
+%%DATADIR%%/lib/jsqlparser-4.3.jar
 %%DATADIR%%/lib/markdowngeneratorJava1_6.jar
 %%DATADIR%%/lib/org.eclipse.equinox.common.jar
 %%DATADIR%%/lib/poi-ooxml-schemas.jar
 %%DATADIR%%/lib/poi-ooxml.jar
 %%DATADIR%%/lib/poi.jar
-%%DATADIR%%/lib/rstaui-3.1.0.jar
-%%DATADIR%%/lib/rsyntaxtextarea-3.1.1.jar
+%%DATADIR%%/lib/rsyntax_RText.jar
+%%DATADIR%%/lib/rsyntax_autocomplete-3.1.5.jar
+%%DATADIR%%/lib/rsyntax_rstaui-3.1.4.jar
+%%DATADIR%%/lib/rsyntax_rsyntaxtextarea-3.1.6.jar
+%%DATADIR%%/lib/slf4j-api-1.7.32.jar
 %%DATADIR%%/lib/sound_jlayer-1.0.1.4.jar
 %%DATADIR%%/lib/sound_jorbis-0.0.17.4.jar
 %%DATADIR%%/lib/sound_mp3spi-1.9.5.4.jar
@@ -136,7 +136,10 @@ bin/squirrel-sql
 %%DATADIR%%/lib/versioncheck.jar
 %%DATADIR%%/lib/xml-apis.jar
 %%DATADIR%%/lib/xmlbeans.jar
-%%DATADIR%%/log4j.properties
+%%DATADIR%%/plugins/cache.jar
+%%DATADIR%%/plugins/cache/doc/changes.txt
+%%DATADIR%%/plugins/cache/doc/licence.txt
+%%DATADIR%%/plugins/cache/doc/readme.txt
 %%DATADIR%%/plugins/codecompletion.jar
 %%DATADIR%%/plugins/codecompletion/doc/changes.txt
 %%DATADIR%%/plugins/codecompletion/doc/completionpopup.jpg
@@ -279,9 +282,13 @@ bin/squirrel-sql
 %%DATADIR%%/plugins/h2/doc/licence.txt
 %%DATADIR%%/plugins/h2/doc/readme.html
 %%DATADIR%%/plugins/hibernate.jar
+%%DATADIR%%/plugins/hibernate/doc/browseEntities.png
 %%DATADIR%%/plugins/hibernate/doc/changes.txt
 %%DATADIR%%/plugins/hibernate/doc/factory.jpg
 %%DATADIR%%/plugins/hibernate/doc/hibernate.jpg
+%%DATADIR%%/plugins/hibernate/doc/hibernateConfig.png
+%%DATADIR%%/plugins/hibernate/doc/hql_jql.png
+%%DATADIR%%/plugins/hibernate/doc/launchInConsole.png
 %%DATADIR%%/plugins/hibernate/doc/licence.txt
 %%DATADIR%%/plugins/hibernate/doc/readme.html
 %%DATADIR%%/plugins/hibernate/doc/session.png
@@ -320,16 +327,19 @@ bin/squirrel-sql
 %%DATADIR%%/plugins/laf/doc/tinylaf-license.txt
 %%DATADIR%%/plugins/laf/doc/tonic-licence.txt
 %%DATADIR%%/plugins/laf/lafs/JTattoo-1.6.10.jar
-%%DATADIR%%/plugins/laf/lafs/flatlaf-1.1.2.jar
+%%DATADIR%%/plugins/laf/lafs/flatlaf-2.1.jar
 %%DATADIR%%/plugins/laf/lafs/ilf-gpl.jar
 %%DATADIR%%/plugins/laf/lafs/jgoodies-common-1.8.1.jar
 %%DATADIR%%/plugins/laf/lafs/jgoodies-looks-2.5.3.jar
 %%DATADIR%%/plugins/laf/lafs/kunststoff.jar
 %%DATADIR%%/plugins/laf/lafs/napkinlaf-1.3-SNAPSHOT.jar
 %%DATADIR%%/plugins/laf/lafs/nimrod-laf.jar
+%%DATADIR%%/plugins/laf/lafs/radiance-animation-5.0.0.jar
+%%DATADIR%%/plugins/laf/lafs/radiance-common-5.0.0.jar
+%%DATADIR%%/plugins/laf/lafs/radiance-theming-5.0.0.jar
+%%DATADIR%%/plugins/laf/lafs/radiance-theming-extras-5.0.0.jar
 %%DATADIR%%/plugins/laf/lafs/readme.txt
 %%DATADIR%%/plugins/laf/lafs/skinlf.jar
-%%DATADIR%%/plugins/laf/lafs/substance.jar
 %%DATADIR%%/plugins/laf/lafs/swingsetthemes.jar
 %%DATADIR%%/plugins/laf/lafs/tinylaf.jar
 %%DATADIR%%/plugins/laf/lafs/toniclf.jar
@@ -556,5 +566,4 @@ bin/squirrel-sql
 %%DATADIR%%/plugins/vertica/doc/readme.html
 %%DATADIR%%/plugins/wikiTableConfigurations.jar
 %%DATADIR%%/squirrel-sql.jar
-%%DATADIR%%/update-log4j.properties
 @dir %%DATADIR%%/plugins/wikiTableConfigurations