diff --git a/org.eyecreate.qiflora.json b/org.eyecreate.qiflora.json
index 68421a6a78a91f845852f7202fd81c33355ccce5..782fdac11f3e7588984ed1e96ea7fb3a5a7c708b 100644
--- a/org.eyecreate.qiflora.json
+++ b/org.eyecreate.qiflora.json
@@ -8,6 +8,8 @@
     "desktop-file-name-suffix": " (Nightly)",
     "finish-args": [
         "--share=ipc",
+        "--allow=bluetooth",
+        "--system-talk-name=org.bluez",
         "--share=network",
         "--socket=x11",
         "--socket=wayland",
@@ -18,6 +20,97 @@
     "separate-locales": false,
 
     "modules": [
+        {
+            "name": "udev",
+            "rm-configure": true,
+            "config-opts": [
+                "--disable-hwdb",
+                "--disable-logging",
+                "--disable-introspection",
+                "--disable-keymap",
+                "--disable-mtd_probe",
+                "--with-systemdsystemunitdir=/app/lib/systemd/"
+            ],
+            "cleanup": [
+                "/include",
+                "/etc",
+                "/libexec",
+                "/sbin",
+                "/lib/pkgconfig",
+                "/lib/systemd",
+                "/man",
+                "/share/aclocal",
+                "/share/doc",
+                "/share/gtk-doc",
+                "/share/man",
+                "/share/pkgconfig",
+                "*.la",
+                "*.a"
+            ],
+            "sources": [
+                {
+                "type": "archive",
+                "url": "https://www.kernel.org/pub/linux/utils/kernel/hotplug/udev-175.tar.bz2",
+                "sha256": "4c7937fe5a1521316ea571188745b9a00a9fdf314228cffc53a7ba9e5968b7ab"
+                },
+                {
+                "type": "patch",
+                "path": "sysmacros.patch"
+                },
+                {
+                "type": "script",
+                "dest-filename": "autogen.sh",
+                "commands": [
+                    "autoreconf -vfi"
+                ]
+                }
+            ],
+            "post-install": [
+                "sed -i 's|${exec_prefix}|/app|g' /app/share/pkgconfig/udev.pc"
+            ]
+        },
+        {
+            "name": "ical",
+            "cleanup": [
+                "/lib/cmake"
+            ],
+            "buildsystem": "cmake-ninja",
+            "config-opts": [
+                "-DCMAKE_BUILD_TYPE=RelWithDebInfo",
+                "-DCMAKE_INSTALL_LIBDIR=/app/lib",
+                "-DBUILD_SHARED_LIBS=ON"
+            ],
+            "sources": [ { "type": "archive", "url": "https://github.com/libical/libical/archive/v3.0.5.tar.gz", "sha256": "483acbf7fee66ca071c2ff8183e46b6f2b3a89e1e866eadf4870eaaa281c8db1" } ]
+        },
+        {
+            "name": "bluez",
+            "config-opts": [
+                "--disable-datafiles",
+                "--disable-systemd",
+                "--enable-library",
+                "--prefix=/app",
+                "--sysconfdir=/app/etc"
+            ],
+            "sources": [ { "type": "archive", "url": "https://mirrors.edge.kernel.org/pub/linux/bluetooth/bluez-5.50.tar.xz", "sha256": "5ffcaae18bbb6155f1591be8c24898dc12f062075a40b538b745bfd477481911"} ]
+        },
+        {
+            "name": "qtconnectivity",
+            "buildsystem": "simple",
+            "cleanup-platform": [
+                "/bin",
+                "/mkspecs"
+            ],
+            "sources": [ { "type": "git", "url": "https://github.com/qt/qtconnectivity", "branch": "5.12.4", "commit": "f6be1f73a810514335ab3d27e1d05825a36b06af" } ],
+            "build-commands": [
+                "qmake",
+                "make -j $FLATPAK_BUILDER_N_JOBS",
+                "cp -r -n bin /app",
+                "cp -r -n include /app",
+                "cp -r -n lib /app",
+                "mkdir -p /app/src/bluetooth",
+                "cp -r src/bluetooth /app/src/"
+            ]
+        },
         {
             "name": "qiflora",
             "buildsystem": "cmake-ninja",
diff --git a/sysmacros.patch b/sysmacros.patch
new file mode 100644
index 0000000000000000000000000000000000000000..76870f989cdb09c2d734e096514a19a2617febb8
--- /dev/null
+++ b/sysmacros.patch
@@ -0,0 +1,112 @@
+diff -Naur udev-175/extras/cdrom_id/cdrom_id.c udev-175-fix/extras/cdrom_id/cdrom_id.c
+--- udev-175/extras/cdrom_id/cdrom_id.c	2011-06-17 03:28:33.251601571 +0200
++++ udev-175-fix/extras/cdrom_id/cdrom_id.c	2019-04-02 12:24:40.131653700 +0200
+@@ -37,6 +37,7 @@
+ #include <sys/time.h>
+ #include <sys/ioctl.h>
+ #include <linux/cdrom.h>
++#include <sys/sysmacros.h>
+ 
+ #include "libudev.h"
+ #include "libudev-private.h"
+diff -Naur udev-175/extras/scsi_id/scsi_serial.c udev-175-fix/extras/scsi_id/scsi_serial.c
+--- udev-175/extras/scsi_id/scsi_serial.c	2011-04-15 00:14:23.739780499 +0200
++++ udev-175-fix/extras/scsi_id/scsi_serial.c	2019-04-02 12:24:18.781548109 +0200
+@@ -33,6 +33,7 @@
+ #include <scsi/sg.h>
+ #include <linux/types.h>
+ #include <linux/bsg.h>
++#include <sys/sysmacros.h>
+ 
+ #include "libudev.h"
+ #include "libudev-private.h"
+diff -Naur udev-175/libudev/libudev-device.c udev-175-fix/libudev/libudev-device.c
+--- udev-175/libudev/libudev-device.c	2011-09-23 14:43:44.305381687 +0200
++++ udev-175-fix/libudev/libudev-device.c	2019-04-02 12:19:17.220061349 +0200
+@@ -24,6 +24,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
+ #include <linux/sockios.h>
++#include <sys/sysmacros.h>
+ 
+ #include "libudev.h"
+ #include "libudev-private.h"
+diff -Naur udev-175/libudev/libudev-device-private.c udev-175-fix/libudev/libudev-device-private.c
+--- udev-175/libudev/libudev-device-private.c	2011-04-24 00:13:02.466797877 +0200
++++ udev-175-fix/libudev/libudev-device-private.c	2019-04-02 12:19:38.570166315 +0200
+@@ -18,6 +18,7 @@
+ #include <fcntl.h>
+ #include <string.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ 
+ #include "libudev.h"
+ #include "libudev-private.h"
+diff -Naur udev-175/libudev/libudev-enumerate.c udev-175-fix/libudev/libudev-enumerate.c
+--- udev-175/libudev/libudev-enumerate.c	2011-08-04 04:26:50.130004746 +0200
++++ udev-175-fix/libudev/libudev-enumerate.c	2019-04-02 12:23:07.947864764 +0200
+@@ -20,7 +20,7 @@
+ #include <stdbool.h>
+ #include <sys/stat.h>
+ #include <sys/param.h>
+-
++#include <sys/sysmacros.h>
+ #include "libudev.h"
+ #include "libudev-private.h"
+ 
+diff -Naur udev-175/udev/udevadm-info.c udev-175-fix/udev/udevadm-info.c
+--- udev-175/udev/udevadm-info.c	2011-10-09 22:49:21.817999569 +0200
++++ udev-175-fix/udev/udevadm-info.c	2019-04-02 12:25:44.908641018 +0200
+@@ -28,6 +28,7 @@
+ #include <fcntl.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ 
+ #include "udev.h"
+ 
+diff -Naur udev-175/udev/udevd.c udev-175-fix/udev/udevd.c
+--- udev-175/udev/udevd.c	2011-10-11 13:25:39.619713005 +0200
++++ udev-175-fix/udev/udevd.c	2019-04-02 12:17:59.529679774 +0200
+@@ -43,6 +43,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/inotify.h>
+ #include <sys/utsname.h>
++#include <sys/sysmacros.h>
+ 
+ #include "udev.h"
+ #include "sd-daemon.h"
+diff -Naur udev-175/udev/udev-event.c udev-175-fix/udev/udev-event.c
+--- udev-175/udev/udev-event.c	2011-10-06 00:58:11.372582876 +0200
++++ udev-175-fix/udev/udev-event.c	2019-04-02 12:18:11.513071921 +0200
+@@ -33,6 +33,7 @@
+ #include <sys/socket.h>
+ #include <sys/signalfd.h>
+ #include <linux/sockios.h>
++#include <sys/sysmacros.h>
+ 
+ #include "udev.h"
+ 
+diff -Naur udev-175/udev/udev-node.c udev-175-fix/udev/udev-node.c
+--- udev-175/udev/udev-node.c	2011-11-01 13:08:15.803635931 +0100
++++ udev-175-fix/udev/udev-node.c	2019-04-02 12:18:21.729788742 +0200
+@@ -28,6 +28,7 @@
+ #include <sys/time.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ 
+ #include "udev.h"
+ 
+diff -Naur udev-175/udev/udev-rules.c udev-175-fix/udev/udev-rules.c
+--- udev-175/udev/udev-rules.c	2011-10-22 21:17:06.587663679 +0200
++++ udev-175-fix/udev/udev-rules.c	2019-04-02 12:18:55.866623075 +0200
+@@ -29,6 +29,7 @@
+ #include <dirent.h>
+ #include <fnmatch.h>
+ #include <time.h>
++#include <sys/sysmacros.h>
+ 
+ #include "udev.h"
+ 
+