diff --git a/core/fakeroot/build b/core/fakeroot/build
index 56c5b64c..31bab235 100755
--- a/core/fakeroot/build
+++ b/core/fakeroot/build
@@ -4,10 +4,13 @@ patch -p1 < silence-dlerror.patch
 patch -p0 < fakeroot-no64.patch
 patch -p0 < fakeroot-stdint.patch
 patch -p0 < busybox_compat_force_abslibpath.patch
+patch -p1 < xstatjunk.patch
 
 export CONFIG_SHELL=/bin/sh
 export CFLAGS="-D_STAT_VER=0 $CFLAGS"
 
+./bootstrap
+
 ac_cv_func_capset=no \
 ./configure \
     --prefix=/usr \
diff --git a/core/fakeroot/checksums b/core/fakeroot/checksums
index c066042d..83ea6799 100644
--- a/core/fakeroot/checksums
+++ b/core/fakeroot/checksums
@@ -3,3 +3,4 @@ d0a6aa8aa462eb4b390d02e177d07df3f2ed5b7961595a22dd38a94043ad8290  busybox_compat
 4fd7a4c8d05dd71414c3e82887780b76d93f599944260c41d769cb463e660bbf  fakeroot-no64.patch
 1b0be39e41ce78116de4db7aed1b025a64427d780f666a860ed30ad1512588ad  fakeroot-stdint.patch
 347f6496c93ed0d91dcb554db92602b50520a16308e3b8bc33822bd69966267b  silence-dlerror.patch
+c4350c514797f0b48440d412380fe1d612958e3cbf1f3b74e3eb5faf2bad6ee0  xstatjunk.patch
diff --git a/core/fakeroot/depends b/core/fakeroot/depends
index 1f97bc3a..913d9292 100644
--- a/core/fakeroot/depends
+++ b/core/fakeroot/depends
@@ -1 +1,3 @@
 linux-headers make
+automake make
+libtool make
diff --git a/core/fakeroot/patches/xstatjunk.patch b/core/fakeroot/patches/xstatjunk.patch
new file mode 100644
index 00000000..0b4e9d6d
--- /dev/null
+++ b/core/fakeroot/patches/xstatjunk.patch
@@ -0,0 +1,11 @@
+--- fakeroot-1.18.4.orig/configure.ac	2012-06-02 18:23:41.000000000 +0000
++++ fakeroot-1.18.4/configure.ac	2015-09-24 23:15:56.917470073 +0000
+@@ -301,7 +301,7 @@
+   FUNC=`echo $SEARCH|sed -e 's/.*%//'`
+   PRE=`echo $SEARCH|sed -e 's/%.*//'`
+   FOUND=
+-  for WRAPPED in __${PRE}x${FUNC} _${PRE}x${FUNC} __${PRE}${FUNC}13 ${PRE}${FUNC}; do
++  for WRAPPED in ${PRE}${FUNC}; do
+     AC_CHECK_FUNCS($WRAPPED,FOUND=$WRAPPED)
+ dnl
+ dnl to unconditionally define only the _* functions, comment out the 2 lines above,
diff --git a/core/fakeroot/sources b/core/fakeroot/sources
index 86675ddc..9ef721f9 100644
--- a/core/fakeroot/sources
+++ b/core/fakeroot/sources
@@ -3,3 +3,4 @@ patches/busybox_compat_force_abslibpath.patch
 patches/fakeroot-no64.patch
 patches/fakeroot-stdint.patch
 patches/silence-dlerror.patch
+patches/xstatjunk.patch
diff --git a/core/fakeroot/version b/core/fakeroot/version
index 54a2883e..e444ac9c 100644
--- a/core/fakeroot/version
+++ b/core/fakeroot/version
@@ -1 +1 @@
-1.23 5
+1.23 6