--- a/bin/ubuntu-defaults-image
+++ b/bin/ubuntu-defaults-image
@@ -31,6 +31,7 @@
 SUITE=$(lsb_release -sc)
 KEEP_APT_OPT=
 DELETE_APT_LISTS="rm -vf /var/lib/apt/lists/*_*"
+PROXY_ARGS=
 
 if which dpkg-architecture >/dev/null 2>&1; then
 	ARCH="$(dpkg-architecture -qDEB_HOST_ARCH)"
@@ -57,6 +58,8 @@
   --keep-apt-components COMPONENTS : 
                             Do not remove apt indexes for selected components from live
                             system [default: none]
+  --http-proxy PROXY      : use a http proxy, formatted http://[user:[password]@]proxy:port
+  --ftp-proxy PROXY       : use an ftp proxy, formatted http://[user:[password]@]proxy:port
 
 EOF
 }
@@ -82,7 +85,7 @@
     done
 }
 
-eval set -- "$(getopt -o '' -l help,locale:,keep-apt,keep-apt-components:,package:,arch:,flavor:,release:,components:,mirror:,security-mirror:,ppa: -- "$@")" || { help; exit 1; }
+eval set -- "$(getopt -o '' -l help,locale:,keep-apt,keep-apt-components:,package:,arch:,flavor:,release:,components:,mirror:,security-mirror:,ppa:,http-proxy:,ftp-proxy: -- "$@")" || { help; exit 1; }
 while :; do
     case $1 in
 	--help)
@@ -155,11 +158,22 @@
             done
             shift 2
             ;;
+	--http-proxy)
+	    http_proxy="$2"
+	    PROXY_ARGS="${PROXY_ARGS} --apt-http-proxy ${http_proxy}"
+	    shift 2
+	    ;;
+	--ftp-proxy)
+	    ftp_proxy="$2"
+	    PROXY_ARGS="${PROXY_ARGS} --apt-ftp-proxy ${ftp_proxy}"
+	    shift 2
+	    ;;
 	--)
 	    shift
 	    break
 	    ;;
 	*)
+            echo $1
 	    help
 	    exit 1
 	    ;;
@@ -206,7 +220,7 @@
 
 SUITE="$SUITE" PROJECT="$FLAVOR" ARCH="$ARCH" LB_ARCHITECTURES="$ARCH" \
     LB_MIRROR_BOOTSTRAP="$MIRROR" LB_MIRROR_CHROOT_SECURITY="$SECURITY_MIRROR" \
-    IMAGEFORMAT=squashfs BINARYFORMAT=iso-hybrid lb config
+    IMAGEFORMAT=squashfs BINARYFORMAT=iso-hybrid lb config "$PROXY_ARGS"
 
 if [ "$COMPONENTS" ]; then
     sed -i "s/^\\(LB_PARENT_ARCHIVE_AREAS=\\).*/\\1\"$COMPONENTS\"/" \