diff -u bcrypt-1.1/debian/changelog bcrypt-1.1/debian/changelog
--- bcrypt-1.1/debian/changelog
+++ bcrypt-1.1/debian/changelog
@@ -1,3 +1,21 @@
+bcrypt (1.1-6) unstable; urgency=low
+
+  * Applied patch to deal with memory problem on amd64 platforms. Closes:
+    #494469 
+  * debian/control:
+    + Moved homepage from description to its own header.
+    + Added dpatch to Build-Depends.
+    + Bumped Standards-Version to 3.8.3.
+    + Bumped debhelper version to 7.4~.
+  * debian/rules:
+    + Added dpatch entries.
+    + Added dh_auto_clean to build stanza.
+    + Changed dh_clean -k to dh_prep in install stanza.
+  * Added new file debian/README.source per Debian Policy.
+  * Bumped debian/compat to 7 from 5.
+
+ -- Kevin Coyner <kcoyner@debian.org>  Thu, 08 Oct 2009 21:42:59 -0400
+
 bcrypt (1.1-5) unstable; urgency=low
 
   * New maintainer e-mail address in debian/control, copyright and changelog.
diff -u bcrypt-1.1/debian/rules bcrypt-1.1/debian/rules
--- bcrypt-1.1/debian/rules
+++ bcrypt-1.1/debian/rules
@@ -22,24 +22,37 @@
 	dh_testdir
 	touch configure-stamp
 
-build: build-stamp
+build: patch build-stamp
 
 build-stamp: configure-stamp
 	dh_testdir
 	$(MAKE)
+	dh_auto_clean
 	touch build-stamp
 
-clean:
+clean: clean-patched unpatch
+
+clean-patched:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
 	[ ! -f Makefile ] || $(MAKE) clean
 	dh_clean
 
+patch: patch-stamp
+
+patch-stamp:
+	dpatch apply-all
+	dpatch cat-all >patch-stamp
+
+unpatch:
+	dpatch deapply-all
+	rm -rf patch-stamp debian/patched
+
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/bcrypt
 
diff -u bcrypt-1.1/debian/control bcrypt-1.1/debian/control
--- bcrypt-1.1/debian/control
+++ bcrypt-1.1/debian/control
@@ -2,8 +2,9 @@
 Section: utils
 Priority: optional
 Maintainer: Kevin Coyner <kcoyner@debian.org>
-Build-Depends: debhelper (>= 5), libz-dev
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 7.4~), libz-dev, dpatch
+Homepage: http://bcrypt.sourceforge.net/
+Standards-Version: 3.8.3
 
 Package: bcrypt
 Architecture: any
@@ -19,2 +19,0 @@
- .
-  Homepage: http://bcrypt.sourceforge.net/
diff -u bcrypt-1.1/debian/compat bcrypt-1.1/debian/compat
--- bcrypt-1.1/debian/compat
+++ bcrypt-1.1/debian/compat
@@ -1 +1 @@
-5
+7
only in patch2:
unchanged:
--- bcrypt-1.1.orig/debian/README.source
+++ bcrypt-1.1/debian/README.source
@@ -0,0 +1 @@
+Please see /usr/share/doc/dpatch/README.source.gz
only in patch2:
unchanged:
--- bcrypt-1.1.orig/debian/patches/10_amd_memory.dpatch
+++ bcrypt-1.1/debian/patches/10_amd_memory.dpatch
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_amd_memory.dpatch by Kevin Coyner <kcoyner@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad bcrypt-1.1~/wrapbf.c bcrypt-1.1/wrapbf.c
+--- bcrypt-1.1~/wrapbf.c	2009-10-08 23:02:14.000000000 -0400
++++ bcrypt-1.1/wrapbf.c	2009-10-18 20:43:14.000000000 -0400
+@@ -21,6 +21,9 @@
+ 
+   getEndian(&myEndian);
+ 
++  if ((*input = realloc(*input, sz + 2)) == NULL)
++    memerror();
++
+   memmove(*input+2, *input, sz);
+ 
+   memcpy(*input, myEndian, 1);
only in patch2:
unchanged:
--- bcrypt-1.1.orig/debian/patches/00list
+++ bcrypt-1.1/debian/patches/00list
@@ -0,0 +1 @@
+10_amd_memory