diff -Nru blender-2.69/debian/changelog blender-2.69/debian/changelog
--- blender-2.69/debian/changelog	2014-02-19 11:30:11.000000000 +0100
+++ blender-2.69/debian/changelog	2014-03-09 00:59:12.000000000 +0100
@@ -1,3 +1,21 @@
+blender (2.69-4ubuntu1) trusty; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Configure without OpenImageIO on armhf, as it is not available on
+      Ubuntu. (LP: #1289899)
+
+ -- Ross Gammon <rossgammon@mail.dk>  Thu, 9 Mar 2014 00:54:00 +0100
+
+blender (2.69-4) unstable; urgency=medium
+
+  * debian/patches/: patchset re-worked
+    - 0011-fix_FTBFS_on_armel.patch refreshed
+    - 0012-fix_FTBFS_on_unofficial_64bit_archs.patch added
+      Thanks to Aurelien Jarno (aurel32) for the hint. (Closes: #739118)
+  * debian/control: S-V bump 3.9.4 => 3.9.5 (no changes needed)
+
+ -- Matteo F. Vescovi <mfvescovi@gmail.com>  Mon, 17 Feb 2014 14:36:00 +0100
+
 blender (2.69-3ubuntu1) trusty; urgency=medium
 
   * Merge with Debian; remaining changes:
@@ -1634,3 +1652,4 @@
   * Initial Release.
 
  -- Stephen Crowley <crow@debian.org>  Fri,  1 Jan 1999 13:47:44 -0600
+
diff -Nru blender-2.69/debian/control blender-2.69/debian/control
--- blender-2.69/debian/control	2014-02-19 11:27:44.000000000 +0100
+++ blender-2.69/debian/control	2014-02-20 02:42:54.000000000 +0100
@@ -46,7 +46,7 @@
                python3-dev
 X-Python3-Version: >= 3.3
 Build-Conflicts: nvidia-glx
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Homepage: http://www.blender.org/
 Vcs-Git: git://anonscm.debian.org/pkg-multimedia/blender.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/blender.git
diff -Nru blender-2.69/debian/patches/0011-fix_FTBFS_on_armel.patch blender-2.69/debian/patches/0011-fix_FTBFS_on_armel.patch
--- blender-2.69/debian/patches/0011-fix_FTBFS_on_armel.patch	2013-12-12 14:41:43.000000000 +0100
+++ blender-2.69/debian/patches/0011-fix_FTBFS_on_armel.patch	2014-02-20 02:42:54.000000000 +0100
@@ -1,6 +1,6 @@
 From: Sergey Sharybin <sergey.vfx@gmail.com>
 Date: Thu, 12 Dec 2013 14:41:06 +0100
-Subject: fix_ftbfs_on_armel
+Subject: fix_FTBFS_on_armel
 
 ---
  intern/atomic/atomic_ops.h | 9 +++++++++
diff -Nru blender-2.69/debian/patches/0012-fix_FTBFS_on_unofficial_64bit_archs.patch blender-2.69/debian/patches/0012-fix_FTBFS_on_unofficial_64bit_archs.patch
--- blender-2.69/debian/patches/0012-fix_FTBFS_on_unofficial_64bit_archs.patch	1970-01-01 01:00:00.000000000 +0100
+++ blender-2.69/debian/patches/0012-fix_FTBFS_on_unofficial_64bit_archs.patch	2014-02-17 12:21:23.000000000 +0100
@@ -0,0 +1,21 @@
+From: "Matteo F. Vescovi" <mfvescovi@gmail.com>
+Date: Mon, 17 Feb 2014 12:20:54 +0100
+Subject: fix_FTBFS_on_unofficial_64bit_archs
+
+---
+ intern/atomic/atomic_ops.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/intern/atomic/atomic_ops.h b/intern/atomic/atomic_ops.h
+index b5a73b1..9f506a6 100644
+--- a/intern/atomic/atomic_ops.h
++++ b/intern/atomic/atomic_ops.h
+@@ -61,7 +61,7 @@
+ #  endif
+ #endif
+ 
+-#if defined(_M_X64) || defined(__amd64__) || defined(__x86_64__)
++#if defined(_M_X64) || defined(__amd64__) || defined(__x86_64__) || defined(__s390x__) || defined(__powerpc64__) || (defined(__sparc__) && defined(__arch64__))
+ #  define LG_SIZEOF_PTR 3
+ #  define LG_SIZEOF_INT 2
+ #else
diff -Nru blender-2.69/debian/patches/series blender-2.69/debian/patches/series
--- blender-2.69/debian/patches/series	2013-12-12 14:42:19.000000000 +0100
+++ blender-2.69/debian/patches/series	2014-02-20 02:42:54.000000000 +0100
@@ -9,3 +9,4 @@
 0009-fix_illegal_hardware_instruction_due_to_SSE2.patch
 0010-fix_FTBFS_on_non-linux_architectures.patch
 0011-fix_FTBFS_on_armel.patch
+0012-fix_FTBFS_on_unofficial_64bit_archs.patch