diff --git a/recipes/samba/samba_3.2.15.bb b/recipes/samba/samba_3.2.15.bb
index eda95d0..3f535b6 100644
--- a/recipes/samba/samba_3.2.15.bb
+++ b/recipes/samba/samba_3.2.15.bb
@@ -9,7 +9,7 @@ SRC_URI += "file://configure-3.2.8.patch \
 SRC_URI[md5sum] = "5a3bcc4927c9643b9f42970d0815b18f"
 SRC_URI[sha256sum] = "84281fd1faeffee8558e49dff865dd382abbf78bc1be00f8cb5aa70aeea67d46"
 
-PR = "r1"
+PR = "r2"
 
 EXTRA_OECONF += "\
 	SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \
@@ -22,6 +22,11 @@ EXTRA_OECONF += "\
 	samba_cv_HAVE_WRFILE_KEYTAB=yes \
 	"
 
+# for arm we always use ARM instruction set
+# gcc 4.5 ICE's in thumb mode
+# see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46934
+
+ARM_INSTRUCTION_SET = "arm"
 do_configure() {
 	oe_runconf
 }