diff --git a/roles/ifupdown2/defaults/main.yml b/roles/ifupdown2/defaults/main.yml
index a419f07..b570a73 100644
--- a/roles/ifupdown2/defaults/main.yml
+++ b/roles/ifupdown2/defaults/main.yml
@@ -1,3 +1,4 @@
 ---
 ifupdown2__interfaces: {}
+ifupdown2__need_upstream_version: False
 ...
diff --git a/roles/ifupdown2/files/ifupdown2_3.1.0-1_all.deb b/roles/ifupdown2/files/ifupdown2_3.1.0-1_all.deb
new file mode 100644
index 0000000..3fc37da
Binary files /dev/null and b/roles/ifupdown2/files/ifupdown2_3.1.0-1_all.deb differ
diff --git a/roles/ifupdown2/tasks/main.yml b/roles/ifupdown2/tasks/main.yml
index aa07c7f..6bcb888 100644
--- a/roles/ifupdown2/tasks/main.yml
+++ b/roles/ifupdown2/tasks/main.yml
@@ -13,9 +13,24 @@
     masked: true
   when: must_mask
 
-- name: Install ifupdown2
+- name: Install ifupdown2 (debian version)
   apt:
     name: ifupdown2
+  when: "not ifupdown2__need_upstream_version"
+
+# FIXME: ifupdown2 3.1.0-1 is not yet available, but is needed for its
+# better VxLAN support
+# See https://github.com/CumulusNetworks/ifupdown2/issues/211
+- name: Install upstream version of ifupdown2
+  block:
+    - name: Upload .deb file
+      copy:
+        src: ifupdown2_3.1.0-1_all.deb
+        dest: /tmp/ifupdown2_3.1.0-1_all.deb
+    - name: Install .deb file
+      apt:
+        deb: /tmp/ifupdown2_3.1.0-1_all.deb
+  when: "ifupdown2__need_upstream_version"
 
 - name: Unmask networking now that ifupdown2 is installed
   systemd: