diff -u unshield-0.5/debian/control unshield-0.5/debian/control
--- unshield-0.5/debian/control
+++ unshield-0.5/debian/control
@@ -1,8 +1,9 @@
 Source: unshield
 Section: utils
 Priority: optional
-Maintainer: Volker Christian <voc@debian.org>
-Build-Depends: debhelper (>= 4.0.0), zlib1g-dev (>= 1.2.1), libtool (>= 1.4), autoconf, automake1.7
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Volker Christian <voc@debian.org>
+Build-Depends: debhelper (>= 4.0.0), zlib1g-dev (>= 1.2.1), libtool (>= 1.4), autoconf, automake1.7, dpatch
 Build-Conflicts: autoconf2.13, automake1.4
 Standards-Version: 3.6.2
 
diff -u unshield-0.5/debian/changelog unshield-0.5/debian/changelog
--- unshield-0.5/debian/changelog
+++ unshield-0.5/debian/changelog
@@ -1,3 +1,15 @@
+unshield (0.5-3ubuntu1) hardy; urgency=low
+
+  * debian/rules : amended to include dpatch patch system
+  * debian : added patches directory
+  * debian/patches : added 00list containing 01_amd64-fix.dpatch
+  * debian/patches : added 01_amd64-fix.dpatch (LP: #172901)
+      linked to http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=350210
+  * debian/roles : changed maintainer as per DebianMaintainerField spec
+  * debian/control : added depend on dpatch
+
+ -- Koen Beek <koen.beek@gmail.com>  Wed, 16 Jan 2008 01:44:39 +0100
+
 unshield (0.5-3) unstable; urgency=low
 
   * Added Build-Depends to libtool, autoconf, and automake
diff -u unshield-0.5/debian/rules unshield-0.5/debian/rules
--- unshield-0.5/debian/rules
+++ unshield-0.5/debian/rules
@@ -35,7 +35,7 @@
 		--infodir=\$${prefix}/share/info
 
 
-build: build-stamp
+build: patch build-stamp
 
 build-stamp:  config.status
 	dh_testdir
@@ -46,7 +46,7 @@
 
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp 
@@ -113,2 +113,12 @@
 binary: binary-indep binary-arch
+
+patch: patch-stamp
+patch-stamp:
+	dpatch apply-all
+	touch patch-stamp
+
+unpatch:
+	dpatch deapply-all
+	rm -rf patch-stamp debian/patched
+
 .PHONY: build clean binary-indep binary-arch binary install 
only in patch2:
unchanged:
--- unshield-0.5.orig/debian/patches/01_amd64-fix.dpatch
+++ unshield-0.5/debian/patches/01_amd64-fix.dpatch
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_amd64-fix.dpatch by  <julien@kirya.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: AMD64 patch from upstream SVN.
+
+@DPATCH@
+diff -urNad unshield-0.5~/lib/md5/global.h unshield-0.5/lib/md5/global.h
+--- unshield-0.5~/lib/md5/global.h	2003-08-25 13:45:20.000000000 +0200
++++ unshield-0.5/lib/md5/global.h	2007-09-17 19:47:52.000000000 +0200
+@@ -17,7 +17,7 @@
+ typedef unsigned short int UINT2;
+ 
+ /* UINT4 defines a four byte word */
+-typedef unsigned long int UINT4;
++typedef unsigned int UINT4;
+ 
+ /* PROTO_LIST is defined depending on how PROTOTYPES is defined above.
+ If using PROTOTYPES, then PROTO_LIST returns the list, otherwise it
+diff -urNad unshield-0.5~/lib/md5/md5c.c unshield-0.5/lib/md5/md5c.c
+--- unshield-0.5~/lib/md5/md5c.c	2003-08-25 13:45:20.000000000 +0200
++++ unshield-0.5/lib/md5/md5c.c	2007-09-17 19:48:08.000000000 +0200
+@@ -68,7 +68,7 @@
+ 
+ /* ROTATE_LEFT rotates x left n bits.
+  */
+-#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))
++#define ROTATE_LEFT(x, n) ((((x) << (n)) & 0xffffffffU) | ((x) >> (32-(n))))
+ 
+ /* FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4.
+ Rotation is separate from addition to prevent recomputation.
only in patch2:
unchanged:
--- unshield-0.5.orig/debian/patches/00list
+++ unshield-0.5/debian/patches/00list
@@ -0,0 +1 @@
+01_amd64-fix.dpatch