diff --git a/port_versions/baseline.json b/port_versions/baseline.json
index 511f9541ab4..7585d297abc 100644
--- a/port_versions/baseline.json
+++ b/port_versions/baseline.json
@@ -5422,7 +5422,7 @@
     },
     "spatialite-tools": {
       "baseline": "5.0.0",
-      "port-version": 0
+      "port-version": 1
     },
     "spdk": {
       "baseline": "19.01.1",
diff --git a/port_versions/s-/spatialite-tools.json b/port_versions/s-/spatialite-tools.json
index 5c968071ed6..6f85784d923 100644
--- a/port_versions/s-/spatialite-tools.json
+++ b/port_versions/s-/spatialite-tools.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e3d595427bd0b0cf8ddaadc45e400b5c1f9c1ccc",
+      "version-string": "5.0.0",
+      "port-version": 1
+    },
     {
       "git-tree": "2a9685999c784265e25e4f2bde708a724721e906",
       "version-string": "5.0.0",
diff --git a/ports/spatialite-tools/CONTROL b/ports/spatialite-tools/CONTROL
index a698cc8b92c..e3a430d4b30 100644
--- a/ports/spatialite-tools/CONTROL
+++ b/ports/spatialite-tools/CONTROL
@@ -1,5 +1,6 @@
 Source: spatialite-tools
 Version: 5.0.0
+Port-Version: 1
 Homepage: https://www.gaia-gis.it/fossil/spatialite-tools/index
 Description: Contains spatialite.exe and other command line tools to work with SpatiaLite databases (import, export, SQL queries)
 Build-Depends: sqlite3, libspatialite, geos, readosm, proj4, zlib, libiconv, expat, librttopo
\ No newline at end of file
diff --git a/ports/spatialite-tools/fix-makefiles.patch b/ports/spatialite-tools/fix-makefiles.patch
index a5a579686bb..3acc32b748b 100644
--- a/ports/spatialite-tools/fix-makefiles.patch
+++ b/ports/spatialite-tools/fix-makefiles.patch
@@ -135,3 +135,55 @@ index 4f4a9538e..d9efecf7b 100644
  	/D_LARGE_FILE=1 /D_FILE_OFFSET_BITS=64 /D_LARGEFILE_SOURCE=1
  #OPTFLAGS=	/nologo /Zi /MD /Fdspatialite.pdb
  
+diff --git a/Makefile.am b/Makefile.am
+index 75ac806..d680b74 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -39,7 +39,7 @@ bin_PROGRAMS = spatialite \
+ 	spatialite_dem
+ endif
+ 
+-AM_CPPFLAGS = @CFLAGS@ @CPPFLAGS@ @LIBXML2_CFLAGS@
++AM_CPPFLAGS = @CFLAGS@ @CPPFLAGS@ @LIBXML2_CFLAGS@ @RTTOPO_CFLAGS@
+ AM_CPPFLAGS += -I$(top_srcdir)
+ 
+ spatialite_SOURCES = shell.c
+@@ -65,27 +65,27 @@ spatialite_osm_overpass_SOURCES = spatialite_osm_overpass.c
+ spatialite_dem_SOURCES = spatialite_dem.c
+ 
+ spatialite_osm_map_LDADD = @LIBSPATIALITE_LIBS@ \
+-	@LIBFREEXL_LIBS@ @LIBREADOSM_LIBS@ 
++	@LIBFREEXL_LIBS@ @LIBREADOSM_LIBS@ @LIBXML2_LIBS@ @RTTOPO_LIBS@
+ spatialite_osm_overpass_LDADD = @LIBSPATIALITE_LIBS@ \
+-	@LIBFREEXL_LIBS@ @LIBXML2_LIBS@ 
++	@LIBFREEXL_LIBS@ @LIBXML2_LIBS@ @RTTOPO_LIBS@
+ spatialite_osm_raw_LDADD = @LIBSPATIALITE_LIBS@ \
+-	@LIBFREEXL_LIBS@ @LIBREADOSM_LIBS@
++	@LIBFREEXL_LIBS@ @LIBREADOSM_LIBS@ @LIBXML2_LIBS@ @RTTOPO_LIBS@
+ spatialite_osm_net_LDADD = @LIBSPATIALITE_LIBS@ \
+-	@LIBFREEXL_LIBS@ @LIBREADOSM_LIBS@
++	@LIBFREEXL_LIBS@ @LIBREADOSM_LIBS@ @LIBXML2_LIBS@ @RTTOPO_LIBS@
+ spatialite_gml_LDADD = @LIBSPATIALITE_LIBS@ \
+-	@LIBFREEXL_LIBS@ \
++	@LIBFREEXL_LIBS@ @LIBXML2_LIBS@ @RTTOPO_LIBS@ \
+ 	-lexpat 
+-spatialite_dem_LDADD = @LIBSPATIALITE_LIBS@ 
++spatialite_dem_LDADD = @LIBSPATIALITE_LIBS@ @LIBFREEXL_LIBS@ @LIBXML2_LIBS@ @RTTOPO_LIBS@
+ spatialite_LDADD = @LIBSPATIALITE_LIBS@ \
+ 	@LIBFREEXL_LIBS@ \
+-	@READLINE_LIBS@
++	@READLINE_LIBS@ @LIBXML2_LIBS@ @RTTOPO_LIBS@
+ spatialite_xml_validator_LDADD = @LIBXML2_LIBS@
+-spatialite_xml_load_LDADD = @LIBSPATIALITE_LIBS@ \
++spatialite_xml_load_LDADD = @LIBSPATIALITE_LIBS@ @LIBFREEXL_LIBS@ @LIBXML2_LIBS@ @RTTOPO_LIBS@\
+ 	-lexpat
+-spatialite_xml_collapse_LDADD = @LIBSPATIALITE_LIBS@
+-spatialite_xml_print_LADD = @LIBSPATIALIATE_LIBS@
++spatialite_xml_collapse_LDADD = @LIBSPATIALITE_LIBS@ @LIBFREEXL_LIBS@ @LIBXML2_LIBS@ @RTTOPO_LIBS@
++spatialite_xml_print_LADD = @LIBSPATIALITE_LIBS@ @LIBFREEXL_LIBS@ @LIBXML2_LIBS@ @RTTOPO_LIBS@
+ LDADD = @LIBSPATIALITE_LIBS@ \
+-	@LIBFREEXL_LIBS@
++	@LIBFREEXL_LIBS@ @LIBXML2_LIBS@ @RTTOPO_LIBS@
+ 
+ EXTRA_DIST = makefile.vc nmake.opt makefile64.vc nmake64.opt \
+ 	config-msvc.h \
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 3ad110d803b..9397501405a 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -1518,8 +1518,6 @@ soundtouch:x64-windows-static-md=fail
 spaceland:arm64-windows=fail
 spaceland:arm-uwp=fail
 spaceland:x64-uwp=fail
-spatialite-tools:x64-linux=fail
-spatialite-tools:x64-osx=fail
 spdk:x64-linux=fail
 spdk-dpdk:arm64-windows=fail
 spdk-dpdk:arm-uwp=fail