diff --git a/pbuilder-dist b/pbuilder-dist
index b3e80eb..6176161 100755
--- a/pbuilder-dist
+++ b/pbuilder-dist
@@ -327,7 +327,9 @@ def main():
 	
 	if len(parts) > 2:
 		requested_arch = parts[2]
-	elif len(args) > 0 and args[0] in ("alpha", "amd64", "arm", "armeb", "armel", "i386", "lpia", "m68k", "mips", "mipsel", "powerpc", "ppc64", "sh4", "sh4eb", "sparc", "sparc64"):
+	elif len(args) > 0 and args[0] in ("alpha", "amd64", "arm", "armeb",
+	"armel", "i386", "lpia", "m68k", "mips", "mipsel", "powerpc", "ppc64",
+	"sh4", "sh4eb", "sparc", "sparc64"):
 		requested_arch = args.pop(0)
 	else:
 		requested_arch = None
@@ -335,7 +337,11 @@ def main():
 	if requested_arch:
 		app.build_architecture = requested_arch
 		# For some foreign architectures we need to use qemu
-		if requested_arch != app.system_architecture and (app.system_architecture, requested_arch) not in [("amd64", "i386"), ("amd64", "lpia"), ("arm", "armel"), ("armel", "arm"), ("i386", "lpia"), ("lpia", "i386"), ("powerpc", "ppc64"), ("ppc64", "powerpc"), ("sparc", "sparc64"), ("sparc64", "sparc")]:
+		if requested_arch != app.system_architecture and (app.system_architecture,
+		requested_arch) not in [("amd64", "i386"), ("amd64", "lpia"),
+		("arm", "armel"), ("armel", "arm"), ("i386", "lpia"), ("lpia", "i386"),
+		("powerpc", "ppc64"), ("ppc64", "powerpc"), ("sparc", "sparc64"),
+		("sparc64", "sparc")]:
 			args.append('--debootstrap qemu-debootstrap')
 	
 	if 'mainonly' in sys.argv: