diff --git a/base/coreutils/coreutils.conf b/base/coreutils/coreutils.conf
index 113bde16b..377faca1f 100644
--- a/base/coreutils/coreutils.conf
+++ b/base/coreutils/coreutils.conf
@@ -22,18 +22,14 @@ if atstage cross; then
 fi
 
 # apply the patches defined in the coreutils.desc
-var_append patchfiles ' ' "`match_source_file -p patch`"
+for x in $(match_source_file -p patch); do
+	var_append patchfiles ' ' "$x"
+done
+
 
 # without injecting coreutils won't build
 var_append GCC_WRAPPER_INSERT ' ' '-std=gnu99'
 
-coreutils_premake() {
-	# remove man/Makefile.maint as it tries to rebuild man pages
-	echo -n "" > man/Makefile.maint
-}
-
-hook_add premake 5 "coreutils_premake"
-
 # Move programs to the locations specified by the FHS
 var_append INSTALL_WRAPPER_FILTER "|" \
 	"sed -e 's,usr/bin/\
diff --git a/base/coreutils/no_man.patch.cross b/base/coreutils/no_man.patch.cross
new file mode 100644
index 000000000..4433e1c11
--- /dev/null
+++ b/base/coreutils/no_man.patch.cross
@@ -0,0 +1,27 @@
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+#
+# Filename: package/.../coreutils/no_man.patch.cross
+# Copyright (C) 2009 The OpenSDE Project
+#
+# More information can be found in the files COPYING and README.
+#
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# --- SDE-COPYRIGHT-NOTE-END ---
+
+--- ./Makefile.in.orig	2009-07-15 21:24:47.000000000 +0300
++++ ./Makefile.in	2009-07-15 21:25:11.000000000 +0300
+@@ -936,7 +936,7 @@
+ 
+ # Some tests always need root privileges, others need them only sometimes.
+ ALL_RECURSIVE_TARGETS = install-root check-root distcheck-hook
+-SUBDIRS = lib src doc man po tests gnulib-tests
++SUBDIRS = lib src doc po tests gnulib-tests
+ changelog_etc = \
+   ChangeLog-2005			\
+   ChangeLog-2006			\