diff -pruN 3.9.2+debian-2/cmd/Makefile 3.9.2+debian-2ubuntu2/cmd/Makefile
--- 3.9.2+debian-2/cmd/Makefile	2010-06-10 08:24:01.000000000 +0100
+++ 3.9.2+debian-2ubuntu2/cmd/Makefile	2010-12-25 13:50:08.000000000 +0000
@@ -29,5 +29,5 @@ wmii/x11.o wmii/xext.o wmii/geom.o wmii/
 
 O9MENU=wmii9menu.o clientutil.o wmii/x11.o wmii/xext.o wmii/geom.o wmii/map.o $(OFILES) $(LIBIXP)
 wmii9menu.out: $(O9MENU)
-	$(LINK) $@ $(O9MENU) $$(pkg-config --libs $(X11PACKAGES) xrandr xinerama) -lXext
+	$(LINK) $@ $(O9MENU) $$(pkg-config --libs $(X11PACKAGES) xrandr xinerama xrender) -lXext
 
diff -pruN 3.9.2+debian-2/debian/changelog 3.9.2+debian-2ubuntu2/debian/changelog
--- 3.9.2+debian-2/debian/changelog	2010-12-06 20:14:37.000000000 +0000
+++ 3.9.2+debian-2ubuntu2/debian/changelog	2010-12-25 10:44:48.000000000 +0000
@@ -1,3 +1,17 @@
+wmii (3.9.2+debian-2ubuntu2) natty; urgency=low
+
+  * Remove alternative dependency on dwm-tools as a part of dwm-tools
+    -> suckless-tools transition because dwm-tools seems to be completely
+    gone now.
+
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Sat, 25 Dec 2010 16:12:02 +0530
+
+wmii (3.9.2+debian-2ubuntu1) natty; urgency=low
+
+  * Fix build failure with ld --no-add-needed.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 07 Dec 2010 13:06:53 +0100
+
 wmii (3.9.2+debian-2) unstable; urgency=low
 
   * QA upload
diff -pruN 3.9.2+debian-2/debian/control 3.9.2+debian-2ubuntu2/debian/control
--- 3.9.2+debian-2/debian/control	2010-12-06 20:14:39.000000000 +0000
+++ 3.9.2+debian-2ubuntu2/debian/control	2010-12-25 10:41:54.000000000 +0000
@@ -1,7 +1,8 @@
 Source: wmii
 Section: x11
 Priority: optional
-Maintainer: Debian QA Group <packages@qa.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian QA Group <packages@qa.debian.org>
 Build-Depends: debhelper (>= 8), libx11-dev, libxext-dev, libixp, libxt-dev,
  libxft-dev, libfreetype6-dev, libxrandr-dev, libxinerama-dev
 Standards-Version: 3.9.1
@@ -9,7 +10,7 @@ Homepage: http://www.suckless.org/
 
 Package: wmii
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, suckless-tools | dwm-tools
+Depends: ${misc:Depends}, ${shlibs:Depends}, suckless-tools 
 Conflicts: wmii2
 Replaces: wmii2
 Recommends: wmii-doc
diff -pruN 3.9.2+debian-2/debian/patches/ld-no-add-needed.patch 3.9.2+debian-2ubuntu2/debian/patches/ld-no-add-needed.patch
--- 3.9.2+debian-2/debian/patches/ld-no-add-needed.patch	1970-01-01 01:00:00.000000000 +0100
+++ 3.9.2+debian-2ubuntu2/debian/patches/ld-no-add-needed.patch	2010-12-07 12:07:23.000000000 +0000
@@ -0,0 +1,34 @@
+Description: Upstream changes introduced in version 3.9.2+debian-2ubuntu1
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ wmii (3.9.2+debian-2ubuntu1) natty; urgency=low
+ .
+   * Fix build failure with ld --no-add-needed.
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Matthias Klose <doko@ubuntu.com>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- wmii-3.9.2+debian.orig/cmd/Makefile
++++ wmii-3.9.2+debian/cmd/Makefile
+@@ -29,5 +29,5 @@ wmii/x11.o wmii/xext.o wmii/geom.o wmii/
+ 
+ O9MENU=wmii9menu.o clientutil.o wmii/x11.o wmii/xext.o wmii/geom.o wmii/map.o $(OFILES) $(LIBIXP)
+ wmii9menu.out: $(O9MENU)
+-	$(LINK) $@ $(O9MENU) $$(pkg-config --libs $(X11PACKAGES) xrandr xinerama) -lXext
++	$(LINK) $@ $(O9MENU) $$(pkg-config --libs $(X11PACKAGES) xrandr xinerama xrender) -lXext
+ 
diff -pruN 3.9.2+debian-2/debian/patches/series 3.9.2+debian-2ubuntu2/debian/patches/series
--- 3.9.2+debian-2/debian/patches/series	2010-11-29 20:39:25.000000000 +0000
+++ 3.9.2+debian-2ubuntu2/debian/patches/series	2010-12-07 12:08:11.000000000 +0000
@@ -1,3 +1,4 @@
 01-x-terminal-emulator.patch
 02-cflags.patch
 03-font.patch
+ld-no-add-needed.patch
diff -pruN 3.9.2+debian-2/.pc/applied-patches 3.9.2+debian-2ubuntu2/.pc/applied-patches
--- 3.9.2+debian-2/.pc/applied-patches	2010-12-25 13:55:23.000000000 +0000
+++ 3.9.2+debian-2ubuntu2/.pc/applied-patches	2010-12-25 13:50:08.000000000 +0000
@@ -1,3 +1,4 @@
 01-x-terminal-emulator.patch
 02-cflags.patch
 03-font.patch
+ld-no-add-needed.patch
diff -pruN 3.9.2+debian-2/.pc/ld-no-add-needed.patch/cmd/Makefile 3.9.2+debian-2ubuntu2/.pc/ld-no-add-needed.patch/cmd/Makefile
--- 3.9.2+debian-2/.pc/ld-no-add-needed.patch/cmd/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ 3.9.2+debian-2ubuntu2/.pc/ld-no-add-needed.patch/cmd/Makefile	2010-06-10 08:24:01.000000000 +0100
@@ -0,0 +1,33 @@
+ROOT=..
+include $(ROOT)/mk/hdr.mk
+include $(ROOT)/mk/wmii.mk
+
+wmiir.c: $(ROOT)/mk/wmii.mk
+
+DIRS =	wmii \
+	menu
+TARG =	wihack    \
+	wmii.rc   \
+	wmii.sh   \
+	wmii9menu \
+	wmiir
+
+OFILES = util.o
+
+LIBS += $(LIBS9)
+CFLAGS += $(INCX11)
+
+include $(ROOT)/mk/many.mk
+include $(ROOT)/mk/dir.mk
+
+OWMIIR=wmiir.o $(OFILES) $(LIBIXP)
+wmiir.out: $(OWMIIR)
+	$(LINK) $@ $(OWMIIR)
+
+wmii/x11.o wmii/xext.o wmii/geom.o wmii/map.o: dall
+	true
+
+O9MENU=wmii9menu.o clientutil.o wmii/x11.o wmii/xext.o wmii/geom.o wmii/map.o $(OFILES) $(LIBIXP)
+wmii9menu.out: $(O9MENU)
+	$(LINK) $@ $(O9MENU) $$(pkg-config --libs $(X11PACKAGES) xrandr xinerama) -lXext
+