diff --git a/src/Makefile b/src/Makefile
index 5e2aafd..16892ae 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -21,7 +21,7 @@ HAIKUOPT = -DHAIKU -DLIBRARY_PATH=\"`finddir B_USER_SETTINGS_DIRECTORY`/yab\"
 ##
 ## Find haiku systenm archetecture from the package file name
 ##
-SYSTEMARCH:= $(shell catattr SYS:PACKAGE_FILE /boot/system/kernel_x86|cut --fields=4 -d-|cut -d. --fields 1)
+SYSTEMARCH:= $(shell catattr SYS:PACKAGE_FILE /boot/system/kernel_x86*|cut --fields=4 -d-|cut -d. --fields 1)
 #
 
 ##
@@ -74,6 +74,9 @@ ifeq ($(USEDARCH), x86)
 else
 	LD = ld
 endif
+ifeq ($(SYSTEMARCH),x86_64)
+	LD=gcc
+endif
 #
 
 LD_OPT = -shared
@@ -178,4 +181,4 @@ install: yab $(YABLIBRARY)
 	cp -f yab /boot/system/non-packaged/bin$(ARCHADD)/
 	cp -f $(YABLIBRARY) /boot/system/non-packaged/lib$(ARCHADD)/
 	cp -f $(YABLIBRARY) /boot/system/non-packaged/develop/lib$(ARCHADD)/
-	
\ No newline at end of file
+