diff --git a/app-cdr/cdrtools/cdrtools-3.01~a17.recipe b/app-cdr/cdrtools/cdrtools-3.01~a17.recipe
index a4a6c2763..5d78afffe 100644
--- a/app-cdr/cdrtools/cdrtools-3.01~a17.recipe
+++ b/app-cdr/cdrtools/cdrtools-3.01~a17.recipe
@@ -25,7 +25,7 @@ LICENSE="
 SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-3.01a17.tar.bz2"
 CHECKSUM_MD5="4cef9db0cf15a770c52d65b00bbee2db"
 REVISION="1"
-ARCHITECTURES="?x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86"
 
 PATCHES='cdrtools-3.01~a17.patch'
 
diff --git a/app-cdr/cdrtools/patches/cdrtools-3.01~a17.patch b/app-cdr/cdrtools/patches/cdrtools-3.01~a17.patch
index 09df8a6de..8fca82f12 100644
--- a/app-cdr/cdrtools/patches/cdrtools-3.01~a17.patch
+++ b/app-cdr/cdrtools/patches/cdrtools-3.01~a17.patch
@@ -6,7 +6,7 @@ diff -urN cdrtools-3.01/DEFAULTS/Defaults.haiku cdrtools-3.01-haiku/DEFAULTS/Def
  
  DEFINCDIRS=	$(SRCROOT)/include
 -LDPATH=		-L/opt/schily/lib
-+LDPATH=		-L$(shell finddir B_COMMON_LIB_DIRECTORY)
++LDPATH=		-L$(shell finddir B_SYSTEM_LIB_DIRECTORY)
  #RUNPATH=	-R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR)
 -RUNPATH=	-R$(INS_BASE)/lib -R/opt/schily/lib
 +RUNPATH=	-R$(INS_BASE)/lib
@@ -17,7 +17,7 @@ diff -urN cdrtools-3.01/DEFAULTS/Defaults.haiku cdrtools-3.01-haiku/DEFAULTS/Def
  #
  ###########################################################################
 -INS_BASE=	/boot/opt/schily
-+INS_BASE=	$(shell finddir B_COMMON_DIRECTORY)
++INS_BASE=	$(shell finddir B_SYSTEM_DIRECTORY)
  INS_KBASE=	/
  INS_RBASE=	/
  #