diff --git a/dev-embedded/gcc6809/gcc6809-4.6.4.recipe b/dev-embedded/gcc6809/gcc6809-4.6.4.recipe
index aa0c16ce4..ea25bbf65 100644
--- a/dev-embedded/gcc6809/gcc6809-4.6.4.recipe
+++ b/dev-embedded/gcc6809/gcc6809-4.6.4.recipe
@@ -12,7 +12,7 @@ LICENSE="
 	"
 PATCHES="gcc6809-$portVersion.patchset"
 
-ARCHITECTURES="!x86_gcc2"
+ARCHITECTURES="!x86_gcc2 all"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
@@ -46,6 +46,7 @@ BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:gperf
 	cmd:ld$secondaryArchSuffix
+	cmd:lwasm
 	cmd:make
 	cmd:makeinfo
 	cmd:sed
diff --git a/dev-embedded/lwtools/lwtools-4.12.recipe b/dev-embedded/lwtools/lwtools-4.12.recipe
deleted file mode 100644
index 45a32310f..000000000
--- a/dev-embedded/lwtools/lwtools-4.12.recipe
+++ /dev/null
@@ -1,58 +0,0 @@
-SUMMARY="Cross-development tools for the Motorola 6809"
-DESCRIPTION="LWTOOLS is a set of cross-development tools for the Motorola 6809 \
-and Hitachi 6309 microprocessors. It supports assembling to raw binaries, CoCo \
-LOADM binaries, and a proprietary object file format for later linking. It also \
-supports macros and file inclusion among other things."
-HOMEPAGE="http://lwtools.projects.l-w.ca/"
-COPYRIGHT="2006-2014 William Astle"
-LICENSE="GNU GPL v3"
-REVISION="2"
-SOURCE_URI="$HOMEPAGE/releases/lwtools/lwtools-$portVersion.tar.gz"
-CHECKSUM_SHA256="42cf63d3964045a0ac4547a01b83e96cdba9ae8f021340d6809261f745bc0aa4"
-
-ARCHITECTURES="!x86_gcc2"
-SECONDARY_ARCHITECTURES="x86"
-
-PROVIDES="
-	lwtools$secondaryArchSuffix = $portVersion
-	cmd:lwar
-	cmd:lwasm
-	cmd:lwlink
-	cmd:lwobjdump
-	cmd:m6809_unknown_ar
-	cmd:m6809_unknown_as
-	cmd:m6809_unknown_ld
-	cmd:m6809_unknown_nm
-	cmd:m6809_unknown_objdump
-	cmd:m6809_unknown_ranlib
-	cmd:m6809_unknown_strip
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	"
-
-BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	cmd:cc$secondaryArchSuffix
-	cmd:make
-	"
-
-BUILD()
-{
-	make
-}
-
-INSTALL()
-{
-	make install INSTALLDIR=$prefix/bin
-
-	# Install the binutil-like interfaces to the tools
-	cp extra/as $prefix/bin/m6809-unknown-as
-	cp extra/ar $prefix/bin/m6809-unknown-ar
-	cp extra/ld $prefix/bin/m6809-unknown-ld
-
-	ln -s /bin/true $prefix/bin/m6809-unknown-nm
-	ln -s /bin/true $prefix/bin/m6809-unknown-objdump
-	ln -s /bin/true $prefix/bin/m6809-unknown-ranlib
-	ln -s /bin/true $prefix/bin/m6809-unknown-strip
-}
diff --git a/dev-embedded/lwtools/lwtools-4.16.recipe b/dev-embedded/lwtools/lwtools-4.22.recipe
similarity index 87%
rename from dev-embedded/lwtools/lwtools-4.16.recipe
rename to dev-embedded/lwtools/lwtools-4.22.recipe
index c3e57b33e..60d3cccd9 100644
--- a/dev-embedded/lwtools/lwtools-4.16.recipe
+++ b/dev-embedded/lwtools/lwtools-4.22.recipe
@@ -4,19 +4,20 @@ and Hitachi 6309 microprocessors. It supports assembling to raw binaries, CoCo \
 LOADM binaries, and a proprietary object file format for later linking. It also \
 supports macros and file inclusion among other things."
 HOMEPAGE="http://lwtools.projects.l-w.ca/"
-COPYRIGHT="2006-2018 William Astle"
+COPYRIGHT="2006-2023 William Astle"
 LICENSE="GNU GPL v3"
 REVISION="1"
 SOURCE_URI="$HOMEPAGE/releases/lwtools/lwtools-$portVersion.tar.gz"
-CHECKSUM_SHA256="e4de2be9cd2407036ffb45ae562d8df653a30776a2d838798e08cec558ee192a"
+CHECKSUM_SHA256="94a176c9d567f5cec49800b85ac16e71fffafdfdfefecb15bcf5d784da19301b"
 
-ARCHITECTURES="!x86_gcc2"
+ARCHITECTURES="!x86_gcc2 all"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	lwtools$secondaryArchSuffix = $portVersion
 	cmd:lwar
 	cmd:lwasm
+	cmd:lwcc_cpp
 	cmd:lwlink
 	cmd:lwobjdump
 	cmd:m6809_unknown_ar
@@ -44,7 +45,7 @@ BUILD()
 
 INSTALL()
 {
-	make install INSTALLDIR=$prefix/bin
+	make install PREFIX=$prefix
 
 	# Install the binutil-like interfaces to the tools
 	cp extra/as $prefix/bin/m6809-unknown-as