diff -Nru /tmp/muzPg3sS1B/pbuilder-0.127/examples/pbuilder-distribution.sh /tmp/dMTzZzckIt/pbuilder-0.129/examples/pbuilder-distribution.sh
--- /tmp/muzPg3sS1B/pbuilder-0.127/examples/pbuilder-distribution.sh	2004-11-17 00:51:38.000000000 +0100
+++ /tmp/dMTzZzckIt/pbuilder-0.129/examples/pbuilder-distribution.sh	2005-05-12 15:59:25.000000000 +0200
@@ -1,6 +1,6 @@
 #!/bin/sh
 # script from Jamin W. Collins  BTS: #255165
-# name this script 'pbuilder-woody', 'pbuilder-sid', 'pbuilder-sarge' etc.
+# name this script 'pbuilder-woody', 'pbuilder-sid', 'pbuilder-sarge', 'pbuilder-experimental' etc.
 
 OPERATION=$1
 DISTRIBUTION=`basename $0 | cut -f2 -d '-'`
diff -Nru /tmp/muzPg3sS1B/pbuilder-0.127/pbuilder.8 /tmp/dMTzZzckIt/pbuilder-0.129/pbuilder.8
--- /tmp/muzPg3sS1B/pbuilder-0.127/pbuilder.8	2005-04-06 01:05:02.000000000 +0200
+++ /tmp/dMTzZzckIt/pbuilder-0.129/pbuilder.8	2005-05-12 15:58:36.000000000 +0200
@@ -180,8 +180,9 @@
 Specifies the distribution used. Currently the supported values are
 .B "sid"
 .B "sarge"
+.B "woody"
 and 
-.B "woody".
+.B "experimental".
 
 This option is only effective for 
 .B "pbuilder create" 
diff -Nru /tmp/muzPg3sS1B/pbuilder-0.127/pbuilder-buildpackage-funcs /tmp/dMTzZzckIt/pbuilder-0.129/pbuilder-buildpackage-funcs
--- /tmp/muzPg3sS1B/pbuilder-0.127/pbuilder-buildpackage-funcs	2005-01-04 02:47:18.000000000 +0100
+++ /tmp/dMTzZzckIt/pbuilder-0.129/pbuilder-buildpackage-funcs	2005-05-12 20:08:02.000000000 +0200
@@ -50,7 +50,7 @@
     fi
     # install extra packages to the chroot
     if [ -n "$EXTRAPACKAGES" ]; then 
-	$CHROOTEXEC usr/bin/apt-get -y install ${EXTRAPACKAGES}
+	$CHROOTEXEC usr/bin/apt-get -y --force-yes install ${EXTRAPACKAGES}
     fi
 }
 
diff -Nru /tmp/muzPg3sS1B/pbuilder-0.127/pbuilder-createbuildenv /tmp/dMTzZzckIt/pbuilder-0.129/pbuilder-createbuildenv
--- /tmp/muzPg3sS1B/pbuilder-0.127/pbuilder-createbuildenv	2004-12-02 00:41:32.000000000 +0100
+++ /tmp/dMTzZzckIt/pbuilder-0.129/pbuilder-createbuildenv	2005-05-12 15:44:54.000000000 +0200
@@ -53,6 +53,10 @@
 	echo "  -> Applying user distribution dist build script $DEBOOTSTRAPSCRIPT"
     fi
 fi
+if [ "$DISTRIBUTION" = "experimental" ]; then
+	DISTRIBUTION=sid
+	EXPERIMENTAL="true"
+fi
 if ! ( cd "$BUILDPLACE" && debootstrap "${DEBOOTSTRAPOPTS[@]}" "$DISTRIBUTION" . "$MIRRORSITE" "$DEBOOTSTRAPSCRIPT" ) ; then
     echo "pbuilder: debootstrap failed" >&2
     exit 1
@@ -66,6 +70,10 @@
 
 copy_local_configuration
 installaptlines
+		  
+if [ -n "$EXPERIMENTAL" ]; then
+	installexppreferences
+fi
 
 echo "Refreshing the base.tgz "
 echo " -> upgrading packages"
@@ -76,8 +84,8 @@
     $CHROOTEXEC /usr/bin/dpkg --purge $REMOVEPACKAGES
 fi
 recover_aptcache
-$CHROOTEXEC /usr/bin/apt-get -y dist-upgrade
-$CHROOTEXEC /usr/bin/apt-get -y install build-essential dpkg-dev apt $EXTRAPACKAGES
+$CHROOTEXEC /usr/bin/apt-get -y --force-yes dist-upgrade
+$CHROOTEXEC /usr/bin/apt-get -y --force-yes install build-essential dpkg-dev apt $EXTRAPACKAGES
 save_aptcache
 $CHROOTEXEC /usr/bin/apt-get clean
 
diff -Nru /tmp/muzPg3sS1B/pbuilder-0.127/pbuilder-modules /tmp/dMTzZzckIt/pbuilder-0.129/pbuilder-modules
--- /tmp/muzPg3sS1B/pbuilder-0.127/pbuilder-modules	2005-04-20 00:39:50.000000000 +0200
+++ /tmp/dMTzZzckIt/pbuilder-0.129/pbuilder-modules	2005-05-14 14:45:46.000000000 +0200
@@ -27,10 +27,10 @@
 pdebuild [pbuilder-options]
 
 command lines:
-pbuilder create [--basetgz base.tgz-path] [--distribution potato|woody|sarge|sid]
+pbuilder create [--basetgz base.tgz-path] [--distribution potato|woody|sarge|sid|experimental]
   Creates a base.tgz
 
-pbuilder update [--basetgz base.tgz-path] [--distribution potato|woody|sarge|sid]
+pbuilder update [--basetgz base.tgz-path] [--distribution potato|woody|sarge|sid|experimental]
   Updates a base.tgz
 
 pbuilder build [--basetgz base.tgz-path] pbuilder_2.2.0-1.dsc
@@ -53,7 +53,7 @@
  --nonusmirror [non-US mirror location]
  --othermirror [other mirror location in apt deb-line format, delimited with | signs]
  --http-proxy [proxy]
- --distribution [distribution(potato/woody/sarge/sid)]
+ --distribution [distribution(potato/woody/sarge/sid/experimental)]
  --buildresult [location-to-copy-build-result]
  --aptcache [location of retrieved package files]
  --removepackages [packages-to-remove on pbuilder create]
@@ -244,6 +244,17 @@
     fi
 }
 
+function installexppreferences (){
+	echo "  -> Installing apt-lines and pinning for experimental"
+    if [ -n "$MIRRORSITE" ] ; then
+		echo "deb $MIRRORSITE ../project/experimental main" >> "$BUILDPLACE"/etc/apt/sources.list
+		echo "#deb-src $MIRRORSITE ../project/experimental main" >> "$BUILDPLACE"/etc/apt/sources.list
+	fi
+	cat >> "$BUILDPLACE"/etc/apt/apt.conf << EOF
+APT::Default-Release "experimental";
+EOF
+}
+
 function copy_local_configuration () {
     echo " -> copying local configuration"
     for a in hosts hostname resolv.conf; do 
diff -Nru /tmp/muzPg3sS1B/pbuilder-0.127/pbuilder-satisfydepends /tmp/dMTzZzckIt/pbuilder-0.129/pbuilder-satisfydepends
--- /tmp/muzPg3sS1B/pbuilder-0.127/pbuilder-satisfydepends	2003-04-20 05:40:36.000000000 +0200
+++ /tmp/dMTzZzckIt/pbuilder-0.129/pbuilder-satisfydepends	2005-05-12 20:08:48.000000000 +0200
@@ -147,10 +147,10 @@
     
     # now actually install the packages
     echo " -> Installing ${INSTALLPKGLIST}"
-    if ! $CHROOTEXEC apt-get -y install ${INSTALLPKGLIST}; then
+    if ! $CHROOTEXEC apt-get -y --force-yes install ${INSTALLPKGLIST}; then
 	echo " -> Trying to fix apt error"
 	# Work around an apt bug which causes configure to fail.
-	if $CHROOTEXEC dpkg --configure --pending && $CHROOTEXEC apt-get -y install ${INSTALLPKGLIST}; then
+	if $CHROOTEXEC dpkg --configure --pending && $CHROOTEXEC apt-get -y --force-yes install ${INSTALLPKGLIST}; then
 	    echo " -> Apt bug workaround succeeded"
 	elif [ "$CONTINUE_FAIL" != "yes" ]; then
 	    echo "E: Unrecoverable error installing build-dependencies." >&2
diff -Nru /tmp/muzPg3sS1B/pbuilder-0.127/pbuilder-updatebuildenv /tmp/dMTzZzckIt/pbuilder-0.129/pbuilder-updatebuildenv
--- /tmp/muzPg3sS1B/pbuilder-0.127/pbuilder-updatebuildenv	2004-06-17 02:19:59.000000000 +0200
+++ /tmp/dMTzZzckIt/pbuilder-0.129/pbuilder-updatebuildenv	2005-06-05 14:28:30.000000000 +0200
@@ -31,7 +31,17 @@
     TRAP=trap
 fi
 
+if [ "$DISTRIBUTION" = "experimental" ]; then
+   DISTRIBUTION=sid
+   EXPERIMENTAL="true"
+fi
+
 extractbuildplace
+
+if [ -n "$EXPERIMENTAL" ]; then
+   installexppreferences
+fi
+
 $TRAP umountproc_cleanbuildplace exit
 
 loadhooks
@@ -44,8 +54,8 @@
 recover_aptcache
 
 $TRAP saveaptcache_umountproc_cleanbuildplace exit
-$CHROOTEXEC /usr/bin/apt-get -y "${FORCE_CONFNEW[@]}" dist-upgrade 
-$CHROOTEXEC /usr/bin/apt-get -y install build-essential dpkg-dev apt $EXTRAPACKAGES
+$CHROOTEXEC /usr/bin/apt-get -y --force-yes "${FORCE_CONFNEW[@]}" dist-upgrade 
+$CHROOTEXEC /usr/bin/apt-get -y --force-yes install build-essential dpkg-dev apt $EXTRAPACKAGES
 save_aptcache
 $TRAP umountproc_cleanbuildplace exit
 $CHROOTEXEC /usr/bin/apt-get clean || true