diff --git a/dev-embedded/gcc6809/gcc6809-4.6.1.recipe b/dev-embedded/gcc6809/gcc6809-4.6.1.recipe
index ff5cb2e71..7bb3e57ec 100644
--- a/dev-embedded/gcc6809/gcc6809-4.6.1.recipe
+++ b/dev-embedded/gcc6809/gcc6809-4.6.1.recipe
@@ -16,15 +16,22 @@ ARCHITECTURES=""
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	# x86_gcc2 is fine as primary target architecture as long as we're building
 	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
 fi
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	gcc6809$secondaryArchSuffix = $portVersion compat >= 4
+	cmd:m6809_unknown_c++$secondaryArchSuffix
+	cmd:m6809_unknown_cpp$secondaryArchSuffix
+	cmd:m6809_unknown_g++$secondaryArchSuffix
+	cmd:m6809_unknown_gcc_$portVersion$secondaryArchSuffix
+	cmd:m6809_unknown_gcc$secondaryArchSuffix
+	cmd:m6809_unknown_gcov$secondaryArchSuffix
 	"
 
 REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
 	cmd:m6809_unknown_ld$secondaryArchSuffix
 "
 
@@ -68,10 +75,13 @@ BUILD()
 		--disable-libssp --with-as=$(which m6809-unknown-as) \
 		--with-ar=$(which m6809-unknown-ar) --with-ld=$(which m6809-unknown-ld)
 
-	make $jobArgs
+	make $jobArgs all-gcc
 }
 
 INSTALL()
 {
-	make install
+	cd $objectsDir
+	make install-gcc
+	# Remove buggy (empty) dir left over by install
+	rm -r $prefix/m6809-unknown
 }