diff --git a/debian/changelog b/debian/changelog
index 654e5399..2e146b07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,16 @@
 llvm-toolchain-3.9 (1:3.9-3) unstable; urgency=medium
 
+  [ Sylvestre Ledru ]
   * The libstdc++-6-dev & libobjc-6-dev are only install with clang-X.Y
     and libclang-X.Y-dev and no longer with libclang1-X.Y
     (Closes: #841309)
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 24 Oct 2016 10:45:07 +0200
+  [ Gianfranco Costamagna ]
+  * d/p/drop-wrong-hack-arm64.patch:
+    - drop hack that was preventing the package from building on
+      non-amd64 64bit architectures:
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 27 Oct 2016 11:45:28 +0200
 
 llvm-toolchain-3.9 (1:3.9-2) unstable; urgency=medium
 
diff --git a/debian/patches/drop-wrong-hack-arm64.patch b/debian/patches/drop-wrong-hack-arm64.patch
new file mode 100644
index 00000000..0fc046f9
--- /dev/null
+++ b/debian/patches/drop-wrong-hack-arm64.patch
@@ -0,0 +1,25 @@
+Description: This hack was needed on 14.04, and for some reason
+ breaks finding pythonlibs in cmake (seen in arm64 and mips64el)
+
+Author: Gianfranco Costamagna <locutusofborg@debian.org>
+
+--- llvm-toolchain-3.9-3.9.orig/lldb/cmake/modules/LLDBConfig.cmake
++++ llvm-toolchain-3.9-3.9/lldb/cmake/modules/LLDBConfig.cmake
+@@ -167,12 +167,12 @@ function(find_python_libs_windows)
+ endfunction(find_python_libs_windows)
+ 
+ if (NOT LLDB_DISABLE_PYTHON)
+-  if(UNIX)
++  #if(UNIX)
+     # This is necessary for crosscompile on Ubuntu 14.04 64bit. Need a proper fix.
+-    if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+-      set(CMAKE_LIBRARY_ARCHITECTURE "x86_64-linux-gnu")
+-    endif()
+-  endif()
++    #if(CMAKE_SIZEOF_VOID_P EQUAL 8)
++    #  set(CMAKE_LIBRARY_ARCHITECTURE "x86_64-linux-gnu")
++    #endif()
++  #endif()
+ 
+   if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
+     find_python_libs_windows()
diff --git a/debian/patches/series b/debian/patches/series
index 13512adc..fcc6aae8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -35,4 +35,4 @@ lldb-link-atomic-cmake.patch
 disable-llvm-symbolizer-test.diff
 kfreebsd-support.diff
 clang-tidy-run-bin.diff
-
+drop-wrong-hack-arm64.patch
diff --git a/debian/rules b/debian/rules
index 8c497036..63a1adb1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ DEB_INST		:= $(CURDIR)/debian/tmp/
 # accomodate that by hardcoding the 5 detection
 GCC_VERSION     := $(shell dpkg-query -W -f '$${Version}' g++ | sed -rne 's,^([0-9]+:)?(5|6|[0-9]+\.[0-9]+|[0-9]+).*$$,\2,p')
 LLVM_VERSION	:= 3.9
-LLVM_VERSION_FULL := $(LLVM_VERSION).1
+LLVM_VERSION_FULL := $(LLVM_VERSION).0
 SONAME_EXT      := 1
 # Manage the case when the version is 1:3.5~svn213052-1~exp1 or 1:3.4.2-1
 DEBIAN_REVISION := $(shell dpkg-parsechangelog |  sed -rne "s,^Version: 1:([0-9.]+)(~|-)(.*),\3,p")