diff --git a/SysBuild/tools/gobject-introspection b/SysBuild/tools/gobject-introspection
index 1b38492..326f23a 100644
--- a/SysBuild/tools/gobject-introspection
+++ b/SysBuild/tools/gobject-introspection
@@ -81,10 +81,10 @@ mk32() {
 	CC="gcc $BUILDOPTIONS32" \
 	CXX="g++ $BUILDOPTIONS32" \
 	USE_ARCH=32 \
-	LDEMULATION=elf32_i386 \
 	./configure --prefix=/usr
-	make USE_ARCH=32 LDEMULATION=elf32_i386 -j $NUMCPU -k
-	make USE_ARCH=32 LDEMULATION=elf32_i386 -j $NUMCPU -k DESTDIR=$TMPROOT install
+	cp /usr/bin/libtool-32 libtool
+	make USE_ARCH=32 -j $NUMCPU -k
+	make USE_ARCH=32 -j $NUMCPU -k DESTDIR=$TMPROOT install
 	make distclean
 }
 
@@ -95,11 +95,15 @@ mk() {
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
-	LDEMULATION=elf64-x86-64 \
 	./configure $ADDOPTIONS \
 		    --prefix=/usr
-	make USE_ARCH=$UARCH LDEMULATION=elf64-x86-64 -j $NUMCPU -k
-	make USE_ARCH=$UARCH LDEMULATION=elf64-x86-64 -j $NUMCPU -k DESTDIR=$TMPROOT install
+	if [ "$MK64BIT" == "true" ]; then
+		cp /usr/bin/libtool-64 libtool
+	else
+		cp /usr/bin/libtool libtool
+	fi
+	make USE_ARCH=$UARCH -j $NUMCPU -k
+	make USE_ARCH=$UARCH -j $NUMCPU -k DESTDIR=$TMPROOT install
 }
 
 postmk() {