diff --git a/repos/libports/lib/import/import-spark.mk b/repos/libports/lib/import/import-spark.mk
index 1b8d8a7e3..52fd58ad7 100644
--- a/repos/libports/lib/import/import-spark.mk
+++ b/repos/libports/lib/import/import-spark.mk
@@ -1,6 +1,6 @@
 ADA_RTS = $(BUILD_BASE_DIR)/var/libcache/spark
 
-ADA_RTS_SOURCE = $(call select_from_ports,ada-runtime)/ada-runtime/contrib/gcc-6.3.0
+ADA_RTS_SOURCE = $(call select_from_ports,ada-runtime)/ada-runtime/contrib/gcc-8.3.0
 ADA_RUNTIME_DIR = $(call select_from_ports,ada-runtime)/ada-runtime/src/minimal
 ADA_RUNTIME_LIB_DIR = $(call select_from_ports,ada-runtime)/ada-runtime/src/lib
 ADA_RUNTIME_COMMON_DIR = $(call select_from_ports,ada-runtime)/ada-runtime/src/common
diff --git a/repos/libports/lib/mk/spark.mk b/repos/libports/lib/mk/spark.mk
index bdc4e5944..74bf6d01d 100644
--- a/repos/libports/lib/mk/spark.mk
+++ b/repos/libports/lib/mk/spark.mk
@@ -5,8 +5,6 @@ ADAINCLUDE = $(ADA_RTS)/adainclude
 
 SRC_ADS += system.ads \
 	   s-soflin.ads \
-	   s-imgint.ads \
-	   s-stoele.ads \
 	   s-unstyp.ads \
 	   interfac.ads \
 	   i-cexten.ads \
@@ -15,7 +13,7 @@ SRC_ADS += system.ads \
 	   ada.ads \
 	   ada_exceptions.ads
 
-SRC_ADB += g-io.adb s-stalib.adb s-secsta.adb s-parame.adb i-c.adb s-arit64.adb
+SRC_ADB += g-io.adb s-stalib.adb s-secsta.adb s-parame.adb i-c.adb s-arit64.adb s-stoele.adb
 CUSTOM_ADA_FLAGS = --RTS=$(ADA_RTS) -c -gnatg -gnatp -gnatpg -gnatn2
 
 # C runtime glue code
diff --git a/repos/libports/lib/symbols/spark b/repos/libports/lib/symbols/spark
index 079ed9bab..2bf468e3e 100644
--- a/repos/libports/lib/symbols/spark
+++ b/repos/libports/lib/symbols/spark
@@ -1,4 +1,3 @@
-__genode_terminal V
 __gl_default_stack_size D 4
 __gl_detect_blocking B 4
 __gl_exception_tracebacks B 4
@@ -23,6 +22,7 @@ __gnat_finalize_library_objects D 8
 __gnat_initialize T
 __gnat_last_chance_handler T
 __gnat_mulv64 T
+__gnat_personality_v0 T
 __gnat_raise_exception T
 __gnat_rcheck_CE_Access_Check T
 __gnat_rcheck_CE_Discriminant_Check T
@@ -78,7 +78,6 @@ ada_exceptions__exception_typeRP T
 ada_exceptions__exception_typeS R 820
 allocate_secondary_stack T
 constraint_error D 40
-get_thread T
 gnat_E D 2
 gnat__io_E D 2
 gnat__io__current_out D 1
@@ -176,9 +175,6 @@ system__frontend_layout R 1
 system__functions_return_by_dsp R 1
 system__gcc_zcx_support R 1
 system__high_integrity_mode R 1
-system__img_int_E D 2
-system__img_int__image_integer T
-system__img_int__set_image_integer T
 system__init_E D 2
 system__long_shifts_inlined R 1
 system__machine_overflows R 1
diff --git a/repos/libports/ports/ada-runtime.hash b/repos/libports/ports/ada-runtime.hash
index 33c1662c9..78ffc347d 100644
--- a/repos/libports/ports/ada-runtime.hash
+++ b/repos/libports/ports/ada-runtime.hash
@@ -1 +1 @@
-4d5a0415395116e71f1a62318b1a8afca3d3ab1c
+892f5f41616ba4db2656fa8b98cf020140581263
diff --git a/repos/libports/ports/ada-runtime.port b/repos/libports/ports/ada-runtime.port
index 05ef2c03e..b08bf647c 100644
--- a/repos/libports/ports/ada-runtime.port
+++ b/repos/libports/ports/ada-runtime.port
@@ -3,12 +3,9 @@ VERSION   := 0
 DOWNLOADS := ada-runtime.git ada-runtime-alis.git
 
 URL(ada-runtime) := https://github.com/Componolit/ada-runtime.git
-REV(ada-runtime) := 116876e3bd7125f4e7804e692c56f60be265ca79
+REV(ada-runtime) := ba6063a06e7b17e6cc4585f3d96abd13c7ad1b0b
 DIR(ada-runtime) := ada-runtime
 
 URL(ada-runtime-alis) := https://github.com/Componolit/ada-runtime-alis.git
-REV(ada-runtime-alis) := 582ee9c1d1f79f304f35bded369119adec770f53
+REV(ada-runtime-alis) := d548a88f1e17ca1cdcf8f48238faf2563732cdd8
 DIR(ada-runtime-alis) := ada-runtime-alis
-
-PATCHES   := $(wildcard $(REP_DIR)/src/lib/ada-runtime-alis/*.patch)
-PATCH_OPT := -p1 -d ada-runtime-alis
diff --git a/repos/libports/recipes/api/spark/content.mk b/repos/libports/recipes/api/spark/content.mk
index 96b3190a8..f7cc22935 100644
--- a/repos/libports/recipes/api/spark/content.mk
+++ b/repos/libports/recipes/api/spark/content.mk
@@ -2,23 +2,33 @@ ADA_RT_DIR  := $(call port_dir,$(GENODE_DIR)/repos/libports/ports/ada-runtime)
 ADA_ALI_DIR := $(call port_dir,$(GENODE_DIR)/repos/libports/ports/ada-runtime)/ada-runtime-alis/alis
 
 MIRROR_FROM_ADA_RT_DIR := \
-	$(addprefix ada-runtime/contrib/gcc-6.3.0/,\
+	$(addprefix ada-runtime/contrib/gcc-8.3.0/,\
 		ada.ads \
 		system.ads \
 		s-stoele.ads \
 		a-unccon.ads \
 		gnat.ads \
 		g-io.ads \
-	)\
+		interfac.ads \
+		i-cexten.ads \
+		s-arit64.ads \
+		s-unstyp.ads \
+	) \
 	$(addprefix ada-runtime/src/minimal/,\
 		s-stalib.ads \
 		a-except.ads \
 		s-secsta.ads \
 		s-parame.ads \
 		s-soflin.ads \
-	)\
+		s-exctab.ads \
+		i-c.ads \
+	) \
 	$(addprefix ada-runtime/src/lib/,\
 		ss_utils.ads \
+		string_utils.ads \
+		platform.ads \
+		ada_exceptions.ads \
+		ada_exceptions.h \
 	)
 
 MIRROR_FROM_ADA_ALI_DIR := \
@@ -28,16 +38,19 @@ MIRROR_FROM_ADA_ALI_DIR := \
 	g-io.ali \
 	gnat.ali \
 	interfac.ali \
+	i-c.ali \
+	i-cexten.ali \
 	platform.ali \
-	s-imgint.ali \
+	s-arit64.ali \
+	s-init.ali \
 	s-parame.ali \
 	s-secsta.ali \
 	s-soflin.ali \
 	s-stalib.ali \
 	s-stoele.ali \
+	s-unstyp.ali \
 	ss_utils.ali \
 	string_utils.ali \
-	s-unstyp.ali \
 	system.ali \
 
 content: $(MIRROR_FROM_ADA_RT_DIR) $(MIRROR_FROM_ADA_ALI_DIR)
diff --git a/repos/libports/recipes/pkg/test-spark_exception/runtime b/repos/libports/recipes/pkg/test-spark_exception/runtime
index 829ffdaa2..fe7cda91c 100644
--- a/repos/libports/recipes/pkg/test-spark_exception/runtime
+++ b/repos/libports/recipes/pkg/test-spark_exception/runtime
@@ -4,7 +4,7 @@
 		<timeout meaning="failed" sec="20" />
 		<log meaning="succeeded">
 			[init -> test-spark_exception] Ada exception test*
-			[init -> test-spark_exception] Error: Exception raised: explicit raise in except.adb: 6
+			[init -> test-spark_exception]*Error: Exception raised: explicit raise in except.adb:6*
 			[init -> test-spark_exception] Caught Ada::Exception::Program_Error*
 			[init] child "test-spark_exception" exited with exit value 0
 		</log>
diff --git a/repos/libports/recipes/src/spark/content.mk b/repos/libports/recipes/src/spark/content.mk
index 740b2a72e..158492353 100644
--- a/repos/libports/recipes/src/spark/content.mk
+++ b/repos/libports/recipes/src/spark/content.mk
@@ -1,15 +1,13 @@
 ADA_RT_DIR := $(call port_dir,$(GENODE_DIR)/repos/libports/ports/ada-runtime)
 
 MIRROR_FROM_ADA_RT_DIR := \
-	$(addprefix ada-runtime/contrib/gcc-6.3.0/,\
+	$(addprefix ada-runtime/contrib/gcc-8.3.0/,\
 		ada.ads \
 		system.ads \
 		interfac.ads \
 		s-unstyp.ads \
 		s-stoele.ads \
 		s-stoele.adb \
-		s-imgint.ads \
-		s-imgint.adb \
 		a-unccon.ads \
 		s-arit64.ads \
 		s-arit64.adb \
@@ -18,8 +16,23 @@ MIRROR_FROM_ADA_RT_DIR := \
 		g-io.adb \
 		i-cexten.ads \
 	) \
-	ada-runtime/src \
-	ada-runtime/platform/genode.cc
+	$(addprefix ada-runtime/src/lib/,\
+		ada_exceptions.ads \
+		ada_exceptions.h \
+		argv.c \
+		exit.c \
+		init.c \
+		platform.ads \
+		platform.adb \
+		ss_utils.ads \
+		ss_utils.adb \
+		string_utils.ads \
+		string_utils.adb \
+	) \
+	ada-runtime/src/common \
+	ada-runtime/src/minimal \
+	ada-runtime/platform/genode.cc \
+	ada-runtime/platform/unwind.h
 
 content: $(MIRROR_FROM_ADA_RT_DIR)
 
diff --git a/repos/libports/src/lib/ada-runtime-alis/v8.patch b/repos/libports/src/lib/ada-runtime-alis/v8.patch
deleted file mode 100644
index 58d9846b8..000000000
--- a/repos/libports/src/lib/ada-runtime-alis/v8.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-Update version numbers to v8
-
-This is a workaround to be able to use the 6.3.0 version of the runtime
-with the Genode 19.05 tool chain.
-
-diff --git a/alis/a-except.ali b/alis/a-except.ali
-index 8f99a7d..4b80d0d 100644
---- a/alis/a-except.ali
-+++ b/alis/a-except.ali
-@@ -1,4 +1,4 @@
--V "GNAT Lib v6"
-+V "GNAT Lib v8"
- P SS FX
- 
- RN
-diff --git a/alis/ada.ali b/alis/ada.ali
-index b7dd2b2..9d97693 100644
---- a/alis/ada.ali
-+++ b/alis/ada.ali
-@@ -1,4 +1,4 @@
--V "GNAT Lib v6"
-+V "GNAT Lib v8"
- P FX
- 
- RN
-diff --git a/alis/ada_exceptions.ali b/alis/ada_exceptions.ali
-index 51c2c45..4670070 100644
---- a/alis/ada_exceptions.ali
-+++ b/alis/ada_exceptions.ali
-@@ -1,4 +1,4 @@
--V "GNAT Lib v6"
-+V "GNAT Lib v8"
- P FX
- 
- RN
-diff --git a/alis/g-io.ali b/alis/g-io.ali
-index 69aa3dc..7e47157 100644
---- a/alis/g-io.ali
-+++ b/alis/g-io.ali
-@@ -1,4 +1,4 @@
--V "GNAT Lib v6"
-+V "GNAT Lib v8"
- P FX
- 
- RN
-diff --git a/alis/gnat.ali b/alis/gnat.ali
-index 9894db2..3575d72 100644
---- a/alis/gnat.ali
-+++ b/alis/gnat.ali
-@@ -1,4 +1,4 @@
--V "GNAT Lib v6"
-+V "GNAT Lib v8"
- P FX
- 
- RN
-diff --git a/alis/interfac.ali b/alis/interfac.ali
-index 564a2a0..77e6c61 100644
---- a/alis/interfac.ali
-+++ b/alis/interfac.ali
-@@ -1,4 +1,4 @@
--V "GNAT Lib v6"
-+V "GNAT Lib v8"
- P FX
- 
- RN
-diff --git a/alis/platform.ali b/alis/platform.ali
-index 6e899c5..7585a73 100644
---- a/alis/platform.ali
-+++ b/alis/platform.ali
-@@ -1,4 +1,4 @@
--V "GNAT Lib v6"
-+V "GNAT Lib v8"
- P FX
- 
- RN
-diff --git a/alis/s-imgint.ali b/alis/s-imgint.ali
-index e71a5ee..0317b9f 100644
---- a/alis/s-imgint.ali
-+++ b/alis/s-imgint.ali
-@@ -1,4 +1,4 @@
--V "GNAT Lib v6"
-+V "GNAT Lib v8"
- P FX
- 
- RN
-diff --git a/alis/s-parame.ali b/alis/s-parame.ali
-index 87c2992..e68ae28 100644
---- a/alis/s-parame.ali
-+++ b/alis/s-parame.ali
-@@ -1,4 +1,4 @@
--V "GNAT Lib v6"
-+V "GNAT Lib v8"
- P FX
- 
- RN
-diff --git a/alis/s-secsta.ali b/alis/s-secsta.ali
-index 8f08e65..7dee1c2 100644
---- a/alis/s-secsta.ali
-+++ b/alis/s-secsta.ali
-@@ -1,4 +1,4 @@
--V "GNAT Lib v6"
-+V "GNAT Lib v8"
- P FX
- 
- RN
-diff --git a/alis/s-soflin.ali b/alis/s-soflin.ali
-index f6f5cac..e134688 100644
---- a/alis/s-soflin.ali
-+++ b/alis/s-soflin.ali
-@@ -1,4 +1,4 @@
--V "GNAT Lib v6"
-+V "GNAT Lib v8"
- P SS FX
- 
- RN
-diff --git a/alis/s-stalib.ali b/alis/s-stalib.ali
-index b9e6d3b..66f1a74 100644
---- a/alis/s-stalib.ali
-+++ b/alis/s-stalib.ali
-@@ -1,4 +1,4 @@
--V "GNAT Lib v6"
-+V "GNAT Lib v8"
- P SS FX
- 
- RN
-diff --git a/alis/s-stoele.ali b/alis/s-stoele.ali
-index 9974a14..79c8c9d 100644
---- a/alis/s-stoele.ali
-+++ b/alis/s-stoele.ali
-@@ -1,4 +1,4 @@
--V "GNAT Lib v6"
-+V "GNAT Lib v8"
- P FX
- 
- RN
-diff --git a/alis/s-unstyp.ali b/alis/s-unstyp.ali
-index 65cdc8e..a6eefe7 100644
---- a/alis/s-unstyp.ali
-+++ b/alis/s-unstyp.ali
-@@ -1,4 +1,4 @@
--V "GNAT Lib v6"
-+V "GNAT Lib v8"
- P FX
- 
- RN
-diff --git a/alis/ss_utils.ali b/alis/ss_utils.ali
-index e1a5e7a..6f44c93 100644
---- a/alis/ss_utils.ali
-+++ b/alis/ss_utils.ali
-@@ -1,4 +1,4 @@
--V "GNAT Lib v6"
-+V "GNAT Lib v8"
- P FX
- 
- RN
-diff --git a/alis/string_utils.ali b/alis/string_utils.ali
-index 0f48c58..18b8e2f 100644
---- a/alis/string_utils.ali
-+++ b/alis/string_utils.ali
-@@ -1,4 +1,4 @@
--V "GNAT Lib v6"
-+V "GNAT Lib v8"
- P SS FX
- 
- RN
-diff --git a/alis/system.ali b/alis/system.ali
-index 0f6557b..d28fcc7 100644
---- a/alis/system.ali
-+++ b/alis/system.ali
-@@ -1,4 +1,4 @@
--V "GNAT Lib v6"
-+V "GNAT Lib v8"
- P FX
- 
- RN