--- makepkg.orig	2009-02-20 11:31:57.000000000 -0200
+++ makepkg	2009-02-20 11:50:16.000000000 -0200
@@ -62,6 +62,7 @@
 SOURCEONLY=0
 IGNOREARCH=0
 HOLDVER=0
+FAKEROOTCMD='fakeroot'
 
 # Forces the pkgver of the current PKGBUILD. Used by the fakeroot call
 # when dealing with svn/cvs/etc PKGBUILDs.
@@ -808,7 +809,7 @@
 	msg2 "$(gettext "Generating .PKGINFO file...")"
 	echo "# Generated by makepkg $myver" >.PKGINFO
 	if [ "$INFAKEROOT" = "1" ]; then
-		echo "# using $(fakeroot -v)" >>.PKGINFO
+		echo "# using $($FAKEROOTCMD -v)" >>.PKGINFO
 	fi
 	echo "# $(LC_ALL=C date -u)" >>.PKGINFO
 	echo "pkgname = $pkgname" >>.PKGINFO
@@ -1215,6 +1216,7 @@
 	echo "$(gettext "      --asroot     Allow makepkg to run as root user")"
 	echo "$(gettext "      --holdver    Prevent automatic version bumping for development PKGBUILDs")"
 	echo "$(gettext "      --source     Generate a source-only tarball without downloaded sources")"
+	echo "$(gettext "      --fakerootcp Use fakeroot-tcp instead of classic fakeroot")"
 	echo
 	echo "$(gettext "These options can be passed to pacman:")"
 	echo
@@ -1270,7 +1272,7 @@
 
 # Parse Command Line Options.
 OPT_SHORT="AbcCdefFghiLmop:rRsV"
-OPT_LONG="allsource,asroot,ignorearch,builddeps,clean,cleancache,nodeps"
+OPT_LONG="allsource,asroot,ignorearch,builddeps,clean,cleancache,nodeps,fakerootcp"
 OPT_LONG="$OPT_LONG,noextract,force,forcever:,geninteg,help,holdver"
 OPT_LONG="$OPT_LONG,install,log,nocolor,nobuild,rmdeps,repackage,source"
 OPT_LONG="$OPT_LONG,syncdeps,version"
@@ -1293,6 +1295,7 @@
 		# Makepkg Options
 		--allsource)      SOURCEONLY=2 ;;
 		--asroot)         ASROOT=1 ;;
+		--fakerootcp)     FAKEROOTCMD='fakeroot-tcp' ;;
 		-A|--ignorearch)  IGNOREARCH=1 ;;
 		-c|--clean)       CLEANUP=1 ;;
 		-C|--cleancache)  CLEANCACHE=1 ;;
@@ -1628,9 +1631,9 @@
 		msg "$(gettext "Entering fakeroot environment...")"
 
 		if [ "$newpkgver" != "" ]; then
-			fakeroot -- $0 --forcever $newpkgver -F $ARGLIST || exit $?
+			$FAKEROOTCMD -- $0 --forcever $newpkgver -F $ARGLIST || exit $?
 		else
-			fakeroot -- $0 -F $ARGLIST || exit $?
+			$FAKEROOTCMD -- $0 -F $ARGLIST || exit $?
 		fi
 	fi