diff -Nru wine-1.1.23~winehq0~ubuntu~9.04/debian/rules wine-1.1.23~kanotix/debian/rules
--- wine-1.1.23~winehq0~ubuntu~9.04/debian/rules	2009-06-21 00:01:24.000000000 +0200
+++ wine-1.1.23~kanotix/debian/rules	2009-06-21 00:03:08.873863892 +0200
@@ -34,8 +34,8 @@
 	# Wine can be built with both 64 and 32 bit support
 	# CONFFLAGS += --enable-win64
 
-	# Wine installs 32 bit libraries, place those into /usr/lib32
-	CONFFLAGS += --libdir=\$${prefix}/lib32
+	# Wine installs 32 bit libraries, place those into /emul/ia32-linux/usr/lib
+	CONFFLAGS += --libdir=$(CURDIR)/debian/tmp/emul/ia32-linux/usr/lib
 endif
 
 
@@ -52,7 +52,7 @@
 
 	# Add here commands to compile the package.
 	$(MAKE) depend
-	$(MAKE)
+	$(MAKE) -j$(shell grep -c ^processor /proc/cpuinfo 2>/dev/null||echo 1)
 
 	# Make the documentation.  The dh_installdocs command should install them
 	# Remember to have the files wine.docs and wine-dev.docs point to any new
diff -Nru wine-1.1.23~winehq0~ubuntu~9.04/debian/wine-dev.install.amd64 wine-1.1.23~kanotix/debian/wine-dev.install.amd64
--- wine-1.1.23~winehq0~ubuntu~9.04/debian/wine-dev.install.amd64	2009-06-21 00:01:24.000000000 +0200
+++ wine-1.1.23~kanotix/debian/wine-dev.install.amd64	2009-06-21 00:09:58.365865601 +0200
@@ -1,2 +1,2 @@
-usr/lib32/*.so
+emul/ia32-linux/usr/lib/*.so
 usr/include
diff -Nru wine-1.1.23~winehq0~ubuntu~9.04/debian/wine.dirs.amd64 wine-1.1.23~kanotix/debian/wine.dirs.amd64
--- wine-1.1.23~winehq0~ubuntu~9.04/debian/wine.dirs.amd64	2009-06-21 00:01:24.000000000 +0200
+++ wine-1.1.23~kanotix/debian/wine.dirs.amd64	2009-06-21 00:03:08.873863892 +0200
@@ -3,6 +3,6 @@
 usr/share/man
 usr/share/man/man1
 usr/share/man/man5
-usr/lib32
-usr/lib32/wine
+emul/ia32-linux/usr/lib
+emul/ia32-linux/usr/lib/wine
 etc/sysctl.d
diff -Nru wine-1.1.23~winehq0~ubuntu~9.04/debian/wine.install.amd64 wine-1.1.23~kanotix/debian/wine.install.amd64
--- wine-1.1.23~winehq0~ubuntu~9.04/debian/wine.install.amd64	2009-06-21 00:01:24.000000000 +0200
+++ wine-1.1.23~kanotix/debian/wine.install.amd64	2009-06-21 00:03:08.873863892 +0200
@@ -1,6 +1,6 @@
 usr/bin
 usr/share
-usr/lib32/wine
-usr/lib32/*.so.*
+emul/ia32-linux/usr/lib/wine
+emul/ia32-linux/usr/lib/*.so.*
 etc/xdg
 etc/sysctl.d