diff --git a/debian/changelog b/debian/changelog
index 2a8ab42e..10c94bc6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 llvm-toolchain-snapshot (1:3.4~svn193603-1) unstable; urgency=low
 
   * New snapshot release
-  * Merge changes from the 3.3 branch (see 1:3.3-10)
+  * Merge changes from the 3.3 branch (see 1:3.3-11)
   * Add lldb-3.4-dev package
   * Remove mipsel-ftbfs.diff (applied upstream)
   * Add support of coverity checker (non-free and not packaged)
@@ -12,6 +12,7 @@ llvm-toolchain-snapshot (1:3.4~svn193603-1) unstable; urgency=low
   * Install libclang.so.1 in /usr/lib/*/libclang-3.3.so.1
   * Also ship the python clang binding (python-clang-3.4)
   * Enable polly if the dependencies are OK
+  * Honor the option "nocheck"
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 20 Sep 2013 05:25:17 +0200
 
diff --git a/debian/control b/debian/control
index 924da393..0984b898 100644
--- a/debian/control
+++ b/debian/control
@@ -430,7 +430,7 @@ Description: Modular compiler and toolchain technologies, examples
  extensions to LLVM and in using it to compile code.
 
 Package: lldb-3.4
-Architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc  alpha arm64 hppa m68k powerpcspe ppc64 sh4 sparc64 x32
+Architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc alpha arm64 hppa m68k powerpcspe ppc64 sh4 sparc64 x32
 # Only hurd has been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.4 (= ${binary:Version}), python, llvm-3.4-dev
 Pre-Depends: ${misc:Pre-Depends}
diff --git a/debian/rules b/debian/rules
index a5061352..0a485d3c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -104,7 +104,7 @@ else
 endif
 
 LLDB_ENABLE=yes
-ifneq (,$(findstring $(DEB_HOST_ARCH), hurd))
+ifeq ($(DEB_HOST_ARCH),hurd-i386)
         LLDB_ENABLE=no
 endif
 
@@ -314,6 +314,7 @@ override_dh_installdeb:
 	rm -f $(CURDIR)/debian/lldb-$(LLVM_VERSION)/usr/lib/python*/dist-packages/lldb/__init__.pyc
 
 
+ifeq (,$(filter nocheck, $(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
 # LLVM tests
 	$(MAKE) -C $(TARGET_BUILD) check || true
@@ -344,6 +345,10 @@ override_dh_auto_test:
 		lcov --remove $$REPORT "/usr*" -o $$REPORT; \
 		genhtml -o reports/coverage --show-details --highlight --legend $$REPORT; \
 	fi
+else
+override_dh_auto_test:
+endif
+
 
 override_dh_gencontrol:
 	dh_gencontrol -- $(control_vars)