diff --git a/builddebs.sh b/builddebs.sh
index 8837f2c6f30..a080d989308 100755
--- a/builddebs.sh
+++ b/builddebs.sh
@@ -17,17 +17,14 @@ echo version $vers
 
 #./pull.sh $vers gz dsc
 
-[ -z "$dists" ] && dists="sid squeeze lenny"
+[ -z "$dists" ] && dists="sid squeeze lenny maverick lucid"
 
 for dist in $dists
 do
     pbuilder --clean
 
-    dvers="$vers-$debsubver"
-    [ "$dist" = "squeeze" ] && dvers="$dvers~bpo60+1"
-    [ "$dist" = "lenny" ] && dvers="$dvers~bpo50+1"
+    dvers=`./debvers.sh $vers-$debsubver $dist`
     echo debian vers $dvers
-
     echo building debs for $dist
 
     cmd="pbuilder build \
@@ -49,9 +46,7 @@ done
 # do lintian checks
 for dist in $dists
 do
-    dvers="$vers-$debsubver"
-    [ "$dist" = "squeeze" ] && dvers="$dvers~bpo60+1"
-    [ "$dist" = "lenny" ] && dvers="$dvers~bpo50+1"
+    dvers=`./debvers.sh $vers-$debsubver $dist`
     echo lintian checks for $dvers
     lintian --allow-root release/$vers/*$dvers*.deb
 done
diff --git a/debvers.sh b/debvers.sh
new file mode 100755
index 00000000000..82ac05ff455
--- /dev/null
+++ b/debvers.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+raw=$1
+dist=$2
+
+[ "$dist" = "sid" ] && dver="$raw"
+[ "$dist" = "squeeze" ] && dver="$raw~bpo60+1"
+[ "$dist" = "lenny" ] && dver="$raw~bpo50+1"
+[ "$dist" = "maverick" ] && dver="$raw$dist"
+[ "$dist" = "lucid" ] && dver="$raw$dist"
+[ "$dist" = "karmic" ] && dver="$raw$dist"
+
+echo $dver
+
diff --git a/publish.sh b/publish.sh
index 55fd6105ec3..14068081227 100755
--- a/publish.sh
+++ b/publish.sh
@@ -29,7 +29,7 @@ else
 fi
 echo component $component
 
-for dist in sid squeeze lenny
+for dist in sid squeeze lenny maverick lucid
 do
     dvers="$vers-$debsubver"
     [ "$dist" = "squeeze" ] && dvers="$dvers~bpo60+1"
diff --git a/release.sh b/release.sh
index 6c9bad4a3d0..3d7210fd484 100755
--- a/release.sh
+++ b/release.sh
@@ -67,15 +67,13 @@ cp -a ../../debian ceph-$cephver
 
 debver="$cephver-$debsubver"
 
-for dist in sid squeeze lenny
+for dist in sid squeeze lenny maverick lucid
 do
     echo building $dist dsc
 #    mkdir $dist
 #    cd $dist
 
-    bpver="$debver"
-    [ "$dist" = "squeeze" ] && bpver="$debver~bpo60+1"
-    [ "$dist" = "lenny" ] && bpver="$debver~bpo50+1"
+    bpver=`../../debvers.sh $debver $dist`
 
     comment=""
 #    [ "$debsubver" != "1" ] && comment="package fixes "
diff --git a/update_pbuilder.sh b/update_pbuilder.sh
index 84f2e32eaeb..f8d33de1676 100755
--- a/update_pbuilder.sh
+++ b/update_pbuilder.sh
@@ -1,17 +1,27 @@
-#!/bin/sh
+#!/bin/sh -x
 
 basedir=~/debian-base
 dist=$1
+os=$2
+[ -z "$os" ] && os="debian"
 
-    pbuilder --clean
+if [ $os = "debian" ]; then
+    mirror="http://http.us.debian.org/debian"
+    othermirror=""
+else
+    mirror=""
+    othermirror="deb http://archive.ubuntu.com/ubuntu $dist main restricted universe multiverse"
+fi
+
+pbuilder --clean
     
-    if [ -e $basedir/$dist.tgz ]; then
-	echo updating $dist base.tgz
-	savelog -l -n  $basedir/$dist.tgz
-	cp $basedir/$dist.tgz.0 $basedir/$dist.tgz
-	pbuilder update --basetgz $basedir/$dist.tgz --distribution $dist --mirror http://http.us.debian.org/debian
-    else
-	echo building $dist base.tgz
-	pbuilder create --basetgz $basedir/$dist.tgz --distribution $dist --mirror http://http.us.debian.org/debian
-    fi
+if [ -e $basedir/$dist.tgz ]; then
+    echo updating $dist base.tgz
+    savelog -l -n  $basedir/$dist.tgz
+    cp $basedir/$dist.tgz.0 $basedir/$dist.tgz
+    pbuilder update --basetgz $basedir/$dist.tgz --distribution $dist #--mirror "$mirror" --othermirror "$othermirror"
+else
+    echo building $dist base.tgz
+    pbuilder create --basetgz $basedir/$dist.tgz --distribution $dist --mirror "$mirror" --othermirror "$othermirror"
+fi