diff --git a/games-simulation/simutrans/simutrans-120.3~nightly.recipe b/games-simulation/simutrans/simutrans-120.3~nightly.recipe
index 3b0d9e79f..30361f7ab 100644
--- a/games-simulation/simutrans/simutrans-120.3~nightly.recipe
+++ b/games-simulation/simutrans/simutrans-120.3~nightly.recipe
@@ -17,8 +17,8 @@ SOURCE_URI="svn://servers.simutrans.org/simutrans/trunk"
 SOURCE_FILENAME="simutrans-$portVersion"
 SOURCE_DIR=""
 
-ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
-SECONDARY_ARCHITECTURES="x86"
+ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="?x86"
 
 GLOBAL_WRITABLE_FILES="
 	non-packaged/$relativeAppsDir/simutrans/config directory keep-old
diff --git a/games-simulation/simutrans_pak128/simutrans_pak128-2.5.2.recipe b/games-simulation/simutrans_pak128/simutrans_pak128-2.5.2.recipe
index 9102b8cc0..c3472a0fe 100644
--- a/games-simulation/simutrans_pak128/simutrans_pak128-2.5.2.recipe
+++ b/games-simulation/simutrans_pak128/simutrans_pak128-2.5.2.recipe
@@ -20,6 +20,7 @@ SOURCE_FILENAME="simupak_128-$portVersion.zip"
 SOURCE_DIR=""
 
 ARCHITECTURES="?any"
+DISABLE_SOURCE_PACKAGE="yes"
 
 GLOBAL_WRITABLE_FILES="
 	non-packaged/$relativeAppsDir/simutrans/pak128/config directory keep-old
diff --git a/games-simulation/simutrans_pak128/simutrans_pak128-2.7.recipe b/games-simulation/simutrans_pak128/simutrans_pak128-2.7.recipe
index 832d8d945..8178d7581 100644
--- a/games-simulation/simutrans_pak128/simutrans_pak128-2.7.recipe
+++ b/games-simulation/simutrans_pak128/simutrans_pak128-2.7.recipe
@@ -18,7 +18,9 @@ SOURCE_URI="https://downloads.sourceforge.net/project/simutrans/pak128/pak128%20
 CHECKSUM_SHA256="8fb29a07290a24495e7b2419de8659c28a2962f094b1c806f472c3b09d37cff4"
 SOURCE_FILENAME="simupak_128-$portVersion.zip"
 SOURCE_DIR="simutrans"
+
 ARCHITECTURES="any"
+DISABLE_SOURCE_PACKAGE="yes"
 
 PROVIDES="
 	simutrans_pak128 = $portVersion
diff --git a/games-simulation/simutrans_pak64/simutrans_pak64-120.0.1.recipe b/games-simulation/simutrans_pak64/simutrans_pak64-120.0.1.recipe
index 6fccead5e..90cd43b0e 100644
--- a/games-simulation/simutrans_pak64/simutrans_pak64-120.0.1.recipe
+++ b/games-simulation/simutrans_pak64/simutrans_pak64-120.0.1.recipe
@@ -20,6 +20,7 @@ SOURCE_FILENAME="simupak_64-$portVersion.zip"
 SOURCE_DIR=""
 
 ARCHITECTURES="any"
+DISABLE_SOURCE_PACKAGE="yes"
 
 GLOBAL_WRITABLE_FILES="
 	non-packaged/$relativeAppsDir/simutrans/pak/config directory keep-old
diff --git a/games-simulation/simutrans_pak64/simutrans_pak64-120.2.recipe b/games-simulation/simutrans_pak64/simutrans_pak64-120.2.recipe
index 36f57b9ce..f45ef7a81 100644
--- a/games-simulation/simutrans_pak64/simutrans_pak64-120.2.recipe
+++ b/games-simulation/simutrans_pak64/simutrans_pak64-120.2.recipe
@@ -20,6 +20,7 @@ SOURCE_FILENAME="simupak_64-$portVersion.zip"
 SOURCE_DIR=""
 
 ARCHITECTURES="any"
+DISABLE_SOURCE_PACKAGE="yes"
 
 PROVIDES="
 	simutrans_pak64 = $portVersion
diff --git a/games-simulation/simutrans_pak64/simutrans_pak64-120.3~nightly.recipe b/games-simulation/simutrans_pak64/simutrans_pak64-120.3~nightly.recipe
index 9009405a8..e1dfed327 100644
--- a/games-simulation/simutrans_pak64/simutrans_pak64-120.3~nightly.recipe
+++ b/games-simulation/simutrans_pak64/simutrans_pak64-120.3~nightly.recipe
@@ -22,8 +22,8 @@ SOURCE_URI="svn+https://svn.code.sf.net/p/simutrans/code/pak64/"
 SOURCE_FILENAME="simupak_64-$portVersion"
 SOURCE_DIR=""
 
-ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
-SECONDARY_ARCHITECTURES="x86"
+ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="?x86"
 
 GLOBAL_WRITABLE_FILES="
 	non-packaged/$relativeAppsDir/simutrans/pak/config directory keep-old
diff --git a/games-util/makeobj/makeobj-60.1~nightly.recipe b/games-util/makeobj/makeobj-60.1~nightly.recipe
index 7e5c61b83..3ae4558cc 100644
--- a/games-util/makeobj/makeobj-60.1~nightly.recipe
+++ b/games-util/makeobj/makeobj-60.1~nightly.recipe
@@ -12,8 +12,8 @@ SOURCE_URI="svn://servers.simutrans.org/simutrans/trunk"
 SOURCE_FILENAME="makeobj-$portVersion"
 SOURCE_DIR=""
 
-ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
-SECONDARY_ARCHITECTURES="x86"
+ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="?x86"
 
 PROVIDES="
 	makeobj$secondaryArchSuffix = $portVersion