diff -Nru csmash-0.6.6/debian/changelog csmash-0.6.6/debian/changelog
--- csmash-0.6.6/debian/changelog	2011-11-09 07:20:42.000000000 +0800
+++ csmash-0.6.6/debian/changelog	2015-03-31 12:00:23.000000000 +0800
@@ -1,3 +1,12 @@
+csmash (0.6.6-6.7) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  
+  [ James Cowgill ]
+  * Use size_t to instead of ifdef for architectures (Closes: 753158)
+
+ -- YunQiang Su <syq@debian.org>  Tue, 31 Mar 2015 11:58:18 +0800
+
 csmash (0.6.6-6.6) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru csmash-0.6.6/debian/patches/01-loadparts.patch csmash-0.6.6/debian/patches/01-loadparts.patch
--- csmash-0.6.6/debian/patches/01-loadparts.patch	2010-05-10 02:33:04.000000000 +0800
+++ csmash-0.6.6/debian/patches/01-loadparts.patch	2015-03-31 11:57:41.000000000 +0800
@@ -1,33 +1,18 @@
-From 715bb929a5bee69b6ec3e7016bf2ffce79c10fbe Mon Sep 17 00:00:00 2001
-From: Jari Aalto <jari.aalto@cante.net>
-Date: Sun, 9 May 2010 21:26:04 +0300
-Subject: [PATCH] loadparts.cpp: add  architechture check by Bartosz Fenski <fenio@debian.org>
-Organization: Private
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
-
-
-Signed-off-by: Jari Aalto <jari.aalto@cante.net>
+Description: fix build failure on 64-bit arches
+ cast 0 to size_t in loadparts.cpp to help the compiler deduce the correct
+ template type
+Author: James Cowgill <james410@cowgill.org.uk>
+Forwarded: no
 ---
- loadparts.cpp |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/loadparts.cpp b/loadparts.cpp
-index 7358aaa..030d903 100644
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/loadparts.cpp
 +++ b/loadparts.cpp
-@@ -245,7 +245,11 @@ bool parts::loadfile(const char *str)
+@@ -245,7 +245,7 @@ bool parts::loadfile(const char *str)
  
  	while ('\\' == line[l-1]) {
              // concat next line(s)
-+#if (defined __ia64__) || (defined __alpha__) || (defined __powerpc64__) || (defined __s390__) || (defined __x86_64__)
-+	    int bufsize = clamp((u_long) 0, sizeof(line)-l, sizeof(line)-1);
-+#else
- 	    int bufsize = clamp(0U, sizeof(line)-l, sizeof(line)-1);
-+#endif
+-	    int bufsize = clamp(0U, sizeof(line)-l, sizeof(line)-1);
++	    int bufsize = clamp((size_t) 0, sizeof(line)-l, sizeof(line)-1);
  	    fgets(&line[l-2], bufsize, fp);
  	    if (feof((FILE*)fp)) break;
  	    l = strlen(line);
--- 
-1.7.0
-