diff --git a/packaging/debian-multiarch/rules b/packaging/debian-multiarch/rules
index d68eb708d..b4957d895 100755
--- a/packaging/debian-multiarch/rules
+++ b/packaging/debian-multiarch/rules
@@ -4,6 +4,7 @@ export DH_VERBOSE=1
 # export DH_OPTIONS="-p sogo"
 
 DESTDIR=$(CURDIR)/debian/tmp
+DIST_CODENAME=$(shell lsb_release -cs)
 
 SAML2_CONFIG=--enable-saml2
 
diff --git a/packaging/debian/rules b/packaging/debian/rules
index b7dba92ea..60ce55ff6 100755
--- a/packaging/debian/rules
+++ b/packaging/debian/rules
@@ -10,12 +10,28 @@ DIST_CODENAME=$(shell lsb_release -cs)
 SAML2_CONFIG=--enable-saml2
 #endif
 
+#ifeq ($(DIST_CODENAME), stretch)
+MFA_CONFIG=--enable-mfa
+#endif
+
+#ifeq ($(DIST_CODENAME), buster)
+MFA_CONFIG=--enable-mfa
+#endif
+
+#ifeq ($(DIST_CODENAME), xenial)
+MFA_CONFIG=--enable-mfa
+#endif
+
+#ifeq ($(DIST_CODENAME), bionic)
+MFA_CONFIG=--enable-mfa
+#endif
+
 include /etc/GNUstep/GNUstep.conf
 include /usr/share/GNUstep/Makefiles/common.make
 
 config.make: configure
 	dh_testdir
-	./configure $(SAML2_CONFIG)
+	./configure $(SAML2_CONFIG) $(MFA_CONFIG)
 
 #Architecture
 build: build-arch