diff --git a/build/jam/repositories/HaikuPortsCross/arm b/build/jam/repositories/HaikuPortsCross/arm
index 21de2f5c6e..dc5d88951c 100644
--- a/build/jam/repositories/HaikuPortsCross/arm
+++ b/build/jam/repositories/HaikuPortsCross/arm
@@ -6,9 +6,9 @@ BootstrapPackageRepository HaikuPortsCross
 	noto-20170202-7
 	:
 	# repository architecture packages (stage 0)
-	gcc_bootstrap-8.3.0_8.3.0_2019_06_02-1
-	gcc_bootstrap_syslibs-8.3.0_2019_06_02-1
-	gcc_bootstrap_syslibs_devel-8.3.0_2019_06_02-1
+	gcc_bootstrap-8.3.0_8.3.0_2019_05_24-1
+	gcc_bootstrap_syslibs-8.3.0_2019_05_24-1
+	gcc_bootstrap_syslibs_devel-8.3.0_2019_05_24-1
 	:
 	# repository architecture packages (stage 1)
 	bash_bootstrap-4.4.012-1
diff --git a/build/jam/repositories/HaikuPortsCross/ppc b/build/jam/repositories/HaikuPortsCross/ppc
index 4896a28b82..7fc8fd011a 100644
--- a/build/jam/repositories/HaikuPortsCross/ppc
+++ b/build/jam/repositories/HaikuPortsCross/ppc
@@ -5,9 +5,9 @@ BootstrapPackageRepository HaikuPortsCross
 	haikuporter-0-1
 	:
 	# repository architecture packages (stage 0)
-	gcc_bootstrap-8.3.0_2019_06_02-1
-	gcc_bootstrap_syslibs-8.3.0_2019_06_02-1
-	gcc_bootstrap_syslibs_devel-8.3.0_2019_06_02-1
+	gcc_bootstrap-8.3.0_2019_05_24-1
+	gcc_bootstrap_syslibs-8.3.0_2019_05_24-1
+	gcc_bootstrap_syslibs_devel-8.3.0_2019_05_24-1
 	:
 	# repository architecture packages (stage 1)
 	bash_bootstrap-4.4.012-1
diff --git a/build/jam/repositories/HaikuPortsCross/riscv64 b/build/jam/repositories/HaikuPortsCross/riscv64
index 9e17e36a74..2bfa1129c1 100644
--- a/build/jam/repositories/HaikuPortsCross/riscv64
+++ b/build/jam/repositories/HaikuPortsCross/riscv64
@@ -6,9 +6,9 @@ BootstrapPackageRepository HaikuPortsCross
 	noto-20170202-7
 	:
 	# repository architecture packages (stage 0)
-	gcc_bootstrap-8.3.0_2019_06_02-1
-	gcc_bootstrap_syslibs-8.3.0_2019_06_02-1
-	gcc_bootstrap_syslibs_devel-8.3.0_2019_06_02-1
+	gcc_bootstrap-8.3.0_2019_05_24-1
+	gcc_bootstrap_syslibs-8.3.0_2019_05_24-1
+	gcc_bootstrap_syslibs_devel-8.3.0_2019_05_24-1
 	:
 	# repository architecture packages (stage 1)
 	bash_bootstrap-4.4.012-1
diff --git a/build/jam/repositories/HaikuPortsCross/sparc b/build/jam/repositories/HaikuPortsCross/sparc
index c349945ea1..42899b9123 100644
--- a/build/jam/repositories/HaikuPortsCross/sparc
+++ b/build/jam/repositories/HaikuPortsCross/sparc
@@ -6,9 +6,9 @@ BootstrapPackageRepository HaikuPortsCross
 	noto-20170202-7
 	:
 	# repository architecture packages (stage 0)
-	gcc_bootstrap-8.3.0_2019_06_02-1
-	gcc_bootstrap_syslibs-8.3.0_2019_06_02-1
-	gcc_bootstrap_syslibs_devel-8.3.0_2019_06_02-1
+	gcc_bootstrap-8.3.0_2019_05_24-1
+	gcc_bootstrap_syslibs-8.3.0_2019_05_24-1
+	gcc_bootstrap_syslibs_devel-8.3.0_2019_05_24-1
 
 	:
 	# repository architecture packages (stage 1)
diff --git a/build/jam/repositories/HaikuPortsCross/x86_64 b/build/jam/repositories/HaikuPortsCross/x86_64
index 4591c726d4..d2822281b4 100644
--- a/build/jam/repositories/HaikuPortsCross/x86_64
+++ b/build/jam/repositories/HaikuPortsCross/x86_64
@@ -6,14 +6,14 @@ BootstrapPackageRepository HaikuPortsCross
 	noto-20170202-7
 	:
 	# repository architecture packages (stage 0)
-	gcc_bootstrap-8.3.0_2019_06_02-1
-	gcc_bootstrap_syslibs-8.3.0_2019_06_02-1
-	gcc_bootstrap_syslibs_devel-8.3.0_2019_06_02-1
+	gcc_bootstrap-8.3.0_2019_05_24-1
+	gcc_bootstrap_syslibs-8.3.0_2019_05_24-1
+	gcc_bootstrap_syslibs_devel-8.3.0_2019_05_24-1
 
 	secondary_x86 @{
-		gcc_bootstrap_x86-8.3.0_2019_06_02-1
-		gcc_bootstrap_x86_syslibs-8.3.0_2019_06_02-1
-		gcc_bootstrap_x86_syslibs_devel-8.3.0_2019_06_02-1
+		gcc_bootstrap_x86-8.3.0_2019_05_24-1
+		gcc_bootstrap_x86_syslibs-8.3.0_2019_05_24-1
+		gcc_bootstrap_x86_syslibs_devel-8.3.0_2019_05_24-1
 	}@ # secondary_x86
 
 	secondary_x86_gcc2 @{