diff -Nru xsane-0.997/debian/changelog xsane-0.997/debian/changelog
--- xsane-0.997/debian/changelog	2010-06-26 16:27:14.000000000 +0000
+++ xsane-0.997/debian/changelog	2010-07-01 16:29:20.000000000 +0000
@@ -1,3 +1,9 @@
+xsane (0.997-2ubuntu2) maverick; urgency=low
+
+  * Disable compiler optimization for thumb2/armv7. (LP: #600717) 
+
+ -- David Sugar <david.sugar@canonical.com>  Thu, 01 Jul 2010 16:12:35 +0000
+
 xsane (0.997-2ubuntu1) maverick; urgency=low
 
   [ Lorenzo De Liso ]
diff -Nru xsane-0.997/debian/rules xsane-0.997/debian/rules
--- xsane-0.997/debian/rules	2010-06-26 15:58:34.000000000 +0000
+++ xsane-0.997/debian/rules	2010-07-01 16:12:24.000000000 +0000
@@ -9,7 +9,7 @@
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
+DEB_BUILD_ARCH       ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -g
@@ -18,6 +18,9 @@
 	INSTALL_PROGRAM += -s
 endif
 
+ifneq (,$(findstring arm,$(DEB_BUILD_ARCH)))
+	CFLAGS += -O0
+endif
 
 autotools: autotools-stamp
 autotools-stamp: