diff --git a/src/apps/bin/coreutils-5.0/Jamfile b/src/apps/bin/coreutils-5.0/Jamfile
index 80eb0a6eeb..b2035b135f 100644
--- a/src/apps/bin/coreutils-5.0/Jamfile
+++ b/src/apps/bin/coreutils-5.0/Jamfile
@@ -1,4 +1,11 @@
 SubDir OBOS_TOP src apps bin coreutils-5.0 ;
 
+# filter warnings we don't want here
+local originalCCFlags = $(CCFLAGS) ;
+CCFLAGS = [ Filter $(CCFLAGS) : -Wall -Wmissing-prototypes -Wsign-compare ] ;
+
 SubInclude OBOS_TOP src apps bin coreutils-5.0 lib ;
 SubInclude OBOS_TOP src apps bin coreutils-5.0 src ; 
+
+# restore CCFLAGS
+CCFLAGS = $(originalCCFlags) ;
diff --git a/src/apps/bin/coreutils-5.0/lib/Jamfile b/src/apps/bin/coreutils-5.0/lib/Jamfile
index 4854175f38..81b5bdf120 100644
--- a/src/apps/bin/coreutils-5.0/lib/Jamfile
+++ b/src/apps/bin/coreutils-5.0/lib/Jamfile
@@ -27,7 +27,7 @@ StaticLibrary fetish :
 	euidaccess.c
 	exclude.c
 	exitfail.c
-#	fchdir-stub.c
+	fchdir-stub.c
 #	fchown-stub.c
 	file-type.c
 #	fileblocks.c
diff --git a/src/apps/bin/findutils/Jamfile b/src/apps/bin/findutils/Jamfile
index 4d3e01307f..8028aa6df7 100644
--- a/src/apps/bin/findutils/Jamfile
+++ b/src/apps/bin/findutils/Jamfile
@@ -1,6 +1,13 @@
 SubDir OBOS_TOP src apps bin findutils ;
 
+# filter warnings we don't want here
+local originalCCFlags = $(CCFLAGS) ;
+CCFLAGS = [ Filter $(CCFLAGS) : -Wall -Wmissing-prototypes -Wsign-compare ] ;
+
 SubInclude OBOS_TOP src apps bin findutils lib ;
 SubInclude OBOS_TOP src apps bin findutils find ;
 SubInclude OBOS_TOP src apps bin findutils locate ;
 SubInclude OBOS_TOP src apps bin findutils xargs ;
+
+# restore CCFLAGS
+CCFLAGS = $(originalCCFlags) ;
diff --git a/src/apps/bin/findutils/config.h b/src/apps/bin/findutils/config.h
index 8480a013b2..9ad1e2ae37 100644
--- a/src/apps/bin/findutils/config.h
+++ b/src/apps/bin/findutils/config.h
@@ -136,7 +136,12 @@
 /* #undef ino_t */
 
 /* Define if you have the fchdir function.  */
+#ifndef B_BEOS_VERSION
+#include <BeBuild.h>
+#endif
+#if B_BEOS_VERSION > B_BEOS_VERSION_5
 #define HAVE_FCHDIR 1
+#endif
 
 /* Define if you have the getcwd function.  */
 #define HAVE_GETCWD 1