diff -u nitpic-0.1/Imakefile nitpic-0.1/Imakefile
--- nitpic-0.1/Imakefile
+++ nitpic-0.1/Imakefile
@@ -10,7 +10,7 @@
 
 INCLUDES = -I$(TOP) -I$(TOOLKITSRC)
 LOCAL_LIBRARIES = $(XAWLIB) $(XEXTLIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
-SYS_LIBRARIES = -lbfd -lopcodes -liberty -lm -lc
+SYS_LIBRARIES = -Wl,-Bstatic -lbfd -lopcodes -Wl,-Bdynamic -lz -liberty -lm -lc
 
 DEPENDFLAGS = $(EXTRA_INCLUDES)
 
reverted:
--- nitpic-0.1/debian/prerm
+++ nitpic-0.1.orig/debian/prerm
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-if [ \( "$1" = "upgrade" || "$1" = "remove" \) && -L /usr/doc/nitpic ]; then
-	rm -f /usr/doc/nitpic
-fi
diff -u nitpic-0.1/debian/control nitpic-0.1/debian/control
--- nitpic-0.1/debian/control
+++ nitpic-0.1/debian/control
@@ -2,7 +2,7 @@
 Section: electronics
 Priority: extra
 Maintainer: Debian QA Group <packages@qa.debian.org>
-Build-Depends: libx11-dev, libxt-dev, libxaw7-dev, xutils-dev, binutils-dev, binutils 
+Build-Depends: libx11-dev, libxt-dev, libxaw7-dev, xutils-dev, binutils-dev, binutils, zlib1g-dev 
 Standards-Version: 3.7.3
 
 Package: nitpic
diff -u nitpic-0.1/debian/rules nitpic-0.1/debian/rules
--- nitpic-0.1/debian/rules
+++ nitpic-0.1/debian/rules
@@ -1,6 +1,6 @@
 #! /usr/bin/make -f
 
-.PHONY: build clean binary binary-indep binary-arch checkdir checkroot
+.PHONY: build build-indep build-arch clean binary binary-indep binary-arch checkdir checkroot
 
 package = nitpic
 d=$(shell pwd)/debian/tmp
@@ -9,7 +9,9 @@
 Makefile: Imakefile
 	xmkmf
 
-build: checkdir Makefile
+build: build-arch
+build-indep:
+build-arch: checkdir Makefile
 	$(MAKE)
 
 clean: checkdir Makefile
@@ -31,7 +33,6 @@
 	
 
 	install -c debian/conffiles $(d)/DEBIAN/
-	install -m 755 -c debian/prerm $(d)/DEBIAN/
 
 	install -c debian/changelog $(d)/usr/share/doc/$(package)/changelog.Debian
 	install -c README $(d)/usr/share/doc/$(package)
@@ -55,7 +56,6 @@
 	chown -fR root.root $(d)
 	find $(d) -type f -print0 | xargs -0 chmod 644
 	find $(d) -type d -print0 | xargs -0 chmod 755
-	chmod a+x $(d)/usr/bin/* $(d)/DEBIAN/prerm
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	$(STRIP) $(d)/usr/bin/nitpic
 endif
diff -u nitpic-0.1/debian/changelog nitpic-0.1/debian/changelog
--- nitpic-0.1/debian/changelog
+++ nitpic-0.1/debian/changelog
@@ -1,3 +1,13 @@
+nitpic (0.1-13) unstable; urgency=low
+
+  * QA upload.
+  * Link statically against binutils libraries (Closes: #648043). As a
+    consequence, we also need to link against zlib.
+  * Drop ancient prerm script from /usr/doc transition.
+  * Add build-indep and build-arch targets to debian/rules.
+
+ -- Magnus Holmgren <holmgren@debian.org>  Tue, 08 Nov 2011 18:32:40 +0100
+
 nitpic (0.1-12) unstable; urgency=low
 
   * QA upload.