diff --git a/packaging/deb/freerdp-nightly/control b/packaging/deb/freerdp-nightly/control
index aafadd531..b491b5866 100644
--- a/packaging/deb/freerdp-nightly/control
+++ b/packaging/deb/freerdp-nightly/control
@@ -5,6 +5,7 @@ Maintainer: FreeRDP <team@freerdp.com>
 Build-Depends:
  debhelper (>= 9),
  cdbs,
+ dpkg-dev,
  autotools-dev,
  cmake,
  pkg-config,
diff --git a/packaging/deb/freerdp-nightly/rules b/packaging/deb/freerdp-nightly/rules
index 72caf2727..a0bafb582 100755
--- a/packaging/deb/freerdp-nightly/rules
+++ b/packaging/deb/freerdp-nightly/rules
@@ -2,6 +2,15 @@
 
 NULL =
 
+DEB_HOST_ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
+
+ifeq ($(DEB_HOST_ARCH), i386)
+SANATIZE_ADDRESS = -DWITH_SANITIZE_ADDRESS=OFF
+else
+SANATIZE_ADDRESS = -DWITH_SANITIZE_ADDRESS=ON
+endif
+
+
 DEB_CMAKE_EXTRA_FLAGS :=  -DCMAKE_SKIP_RPATH=FALSE \
                           -DCMAKE_SKIP_INSTALL_RPATH=FALSE \
                           -DWITH_PULSE=ON \
@@ -20,7 +29,7 @@ DEB_CMAKE_EXTRA_FLAGS :=  -DCMAKE_SKIP_RPATH=FALSE \
                           -DCMAKE_INSTALL_PREFIX=/opt/freerdp-nightly/ \
                           -DCMAKE_INSTALL_INCLUDEDIR=include \
                           -DCMAKE_INSTALL_LIBDIR=lib \
-                          -DWITH_SANITIZE_ADDRESS=ON \
+                          $(SANATIZE_ADDRESS) \
                           $(NULL)
 
 %: