diff --git a/Makefile b/Makefile
index 0b51a6e..a184c76 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,8 @@ CFLAGS+=-D_GNU_SOURCE
 endif
 
 # Define this if you want i3status to spit out dzen2-compatible output on stdout
-CFLAGS+=-DDZEN
+#CFLAGS+=-DDZEN
+CFLAGS+=$(EXTRA_CFLAGS)
 
 i3status: i3status.o i3status.h
 
diff --git a/debian/control b/debian/control
index d07cca6..2f68cac 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,17 @@ Priority: optional
 Section: utils
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: dzen2
-Description: Generates a status line for dzen2 or wmii
- i3status is a program running in background, feeding dzen2 or filling up
- wmii's status bar using wmiis plan9 pseudo file system (therefore, you
- need 9pfs).
+Description: Generates a status line for dzen2
+ i3status is a program running in background feeding dzen2 with information
+ about your system (IP address and speed of your ethernet device, WLAN signal
+ strength, load, time, ...).
+
+Package: i3status-wmii
+Architecture: any
+Priority: optional
+Section: utils
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: wmii
+Description: Generates a status line for wmii
+ i3status is a program running in background, filling up wmii's status bar
+ using wmiis plan9 pseudo file system (therefore, you need 9pfs).
diff --git a/debian/rules b/debian/rules
index 07c0fd8..d9baa9c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,65 +9,73 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-build: build-stamp
-
-build-stamp:
+build-i3status: clean
 	dh_testdir
+	$(MAKE) EXTRA_CFLAGS="-DDZEN"
+	touch $@
 
-	# Add here commands to compile the package.
+build-i3status-wmii: clean
+	dh_testdir
+	# Ensure that i3status is rebuilt
+	$(MAKE) clean
 	$(MAKE)
-
 	touch $@
 
 clean: 
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp config.status
-
-	# Add here commands to clean up after the build process.
 	[ ! -f Makefile ] || $(MAKE) distclean
-
 	dh_clean 
 
-install: build
+install: install-i3status install-i3status-wmii
+
+install-i3status: build-i3status
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
 	dh_installdirs
-
-	# Add here commands to install the package into debian/i3status.
 	$(MAKE) DESTDIR=$(CURDIR)/debian/i3status/ install
 
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
+install-i3status-wmii: build-i3status-wmii
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs 
+	dh_installdirs
+	$(MAKE) DESTDIR=$(CURDIR)/debian/i3status-wmii/ install
+
+binary-indep: build install
+
+binary-arch: binary-i3status binary-i3status-wmii
+
+binary-i3status: build-stamp-i3status
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs
+	dh_installdocs
+	dh_installexamples
+	dh_installinit
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary-i3status-wmii: build-stamp-i3status-wmii
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs
 	dh_installdocs
 	dh_installexamples
-#	dh_install
-#	dh_installmenu
-	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_python
 	dh_installinit
-#	dh_installcron
-#	dh_installinfo
 	dh_installman
 	dh_link
 	dh_strip
 	dh_compress
 	dh_fixperms
-#	dh_perl
-#	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol