diff --git a/debian/changelog b/debian/changelog
index 20e0447..5b529e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libhdate (1.6-4) UNRELEASED; urgency=medium
+
+  * Remove some Multiarch settings. A temporary workaround for now.
+    (Closes: #807516, #818539)
+
+ -- Tzafrir Cohen <tzafrir@debian.org>  Tue, 24 Jan 2017 15:30:24 +0200
+
 libhdate (1.6-3) unstable; urgency=medium
 
   * Incorporate previous NMUs.
diff --git a/debian/control b/debian/control
index 3d65b37..771c555 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,6 @@
 
 Package: libhdate-dev
 Architecture: any
-Multi-Arch: same
 Depends: libhdate1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: Provides a library that help use hebrew dates (development files)
  LibHdate is a small C,C++ library for Hebrew dates,
@@ -26,7 +25,6 @@
 Package: python-hdate
 Section: python
 Architecture: any
-Multi-Arch: foreign
 Provides: ${python:Provides}
 Depends: libhdate1 (= ${binary:Version}), ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Description: Provides a library that help use hebrew dates (python bindings)