diff --git a/debian b/debian
new file mode 120000
index 0000000..cd83f55
--- /dev/null
+++ b/debian
@@ -0,0 +1 @@
+debian-qt5
\ No newline at end of file
diff --git a/debian/changelog b/debian-qt5/changelog
similarity index 100%
rename from debian/changelog
rename to debian-qt5/changelog
diff --git a/debian/compat b/debian-qt5/compat
similarity index 100%
rename from debian/compat
rename to debian-qt5/compat
diff --git a/debian/control b/debian-qt5/control
similarity index 100%
rename from debian/control
rename to debian-qt5/control
diff --git a/debian/copyright b/debian-qt5/copyright
similarity index 100%
rename from debian/copyright
rename to debian-qt5/copyright
diff --git a/debian/libnymea-mqtt-dev.install.in b/debian-qt5/libnymea-mqtt-dev.install.in
similarity index 100%
rename from debian/libnymea-mqtt-dev.install.in
rename to debian-qt5/libnymea-mqtt-dev.install.in
diff --git a/debian/libnymea-mqtt.install.in b/debian-qt5/libnymea-mqtt.install.in
similarity index 100%
rename from debian/libnymea-mqtt.install.in
rename to debian-qt5/libnymea-mqtt.install.in
diff --git a/debian/nymea-mqtt-client.install b/debian-qt5/nymea-mqtt-client.install
similarity index 100%
rename from debian/nymea-mqtt-client.install
rename to debian-qt5/nymea-mqtt-client.install
diff --git a/debian/nymea-mqtt-server.install b/debian-qt5/nymea-mqtt-server.install
similarity index 100%
rename from debian/nymea-mqtt-server.install
rename to debian-qt5/nymea-mqtt-server.install
diff --git a/debian/nymea-mqtt-tests.install b/debian-qt5/nymea-mqtt-tests.install
similarity index 100%
rename from debian/nymea-mqtt-tests.install
rename to debian-qt5/nymea-mqtt-tests.install
diff --git a/debian/rules b/debian-qt5/rules
similarity index 100%
rename from debian/rules
rename to debian-qt5/rules
diff --git a/debian/source/format b/debian-qt5/source/format
similarity index 100%
rename from debian/source/format
rename to debian-qt5/source/format
diff --git a/debian-qt6/changelog b/debian-qt6/changelog
new file mode 120000
index 0000000..98cdf8f
--- /dev/null
+++ b/debian-qt6/changelog
@@ -0,0 +1 @@
+../debian-qt5/changelog
\ No newline at end of file
diff --git a/debian-qt6/compat b/debian-qt6/compat
new file mode 100644
index 0000000..b1bd38b
--- /dev/null
+++ b/debian-qt6/compat
@@ -0,0 +1 @@
+13
diff --git a/debian-qt6/control b/debian-qt6/control
new file mode 100644
index 0000000..d06597f
--- /dev/null
+++ b/debian-qt6/control
@@ -0,0 +1,61 @@
+Source: nymea-mqtt
+Section: comm
+Priority: optional
+Maintainer: nymea GmbH <developer@nymea.io>
+Standards-Version: 4.7.2
+Homepage: http://nymea.io
+Build-Depends: debhelper,
+               dpkg-dev,
+               libssl-dev,
+               pkg-config,
+               qt6-base-dev,
+               qt6-base-dev-tools,
+               qt6-websockets-dev
+
+Package: libnymea-mqtt
+Architecture: any
+Multi-Arch: same
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+Description: nymea-mqtt library
+ nymeas mqtt implementation for mqtt client and server development.
+
+
+Package: libnymea-mqtt-dev
+Section: devel
+Architecture: any
+Multi-Arch: same
+Depends:
+ libnymea-mqtt (=${binary:Version}),
+ ${misc:Depends},
+Description: nymea-mqtt libaries - development files
+ nymeas mqtt implementation for mqtt client and server development.
+ This package contains related development files.
+
+
+Package: nymea-mqtt-server
+Architecture: any
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+Description: nymea-mqtt standalone server
+ nymeas mqtt implementation. This package contains a standalone mqtt server.
+
+
+Package: nymea-mqtt-client
+Architecture: any
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+Description: nymea-mqtt command line client
+ nymeas mqtt implementation. This package contains a command line mqtt client.
+
+
+Package: nymea-mqtt-tests
+Architecture: any
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+Description: nymea-mqtt tests
+ nymeas mqtt implementation. This package contains the tests for the library.
diff --git a/debian-qt6/copyright b/debian-qt6/copyright
new file mode 120000
index 0000000..cc65877
--- /dev/null
+++ b/debian-qt6/copyright
@@ -0,0 +1 @@
+../debian-qt5/copyright
\ No newline at end of file
diff --git a/debian-qt6/libnymea-mqtt-dev.install.in b/debian-qt6/libnymea-mqtt-dev.install.in
new file mode 120000
index 0000000..f48e85d
--- /dev/null
+++ b/debian-qt6/libnymea-mqtt-dev.install.in
@@ -0,0 +1 @@
+../debian-qt5/libnymea-mqtt-dev.install.in
\ No newline at end of file
diff --git a/debian-qt6/libnymea-mqtt.install.in b/debian-qt6/libnymea-mqtt.install.in
new file mode 120000
index 0000000..15ecbbb
--- /dev/null
+++ b/debian-qt6/libnymea-mqtt.install.in
@@ -0,0 +1 @@
+../debian-qt5/libnymea-mqtt.install.in
\ No newline at end of file
diff --git a/debian-qt6/nymea-mqtt-client.install b/debian-qt6/nymea-mqtt-client.install
new file mode 120000
index 0000000..6f95c10
--- /dev/null
+++ b/debian-qt6/nymea-mqtt-client.install
@@ -0,0 +1 @@
+../debian-qt5/nymea-mqtt-client.install
\ No newline at end of file
diff --git a/debian-qt6/nymea-mqtt-server.install b/debian-qt6/nymea-mqtt-server.install
new file mode 120000
index 0000000..ceb118a
--- /dev/null
+++ b/debian-qt6/nymea-mqtt-server.install
@@ -0,0 +1 @@
+../debian-qt5/nymea-mqtt-server.install
\ No newline at end of file
diff --git a/debian-qt6/nymea-mqtt-tests.install b/debian-qt6/nymea-mqtt-tests.install
new file mode 120000
index 0000000..5ea4994
--- /dev/null
+++ b/debian-qt6/nymea-mqtt-tests.install
@@ -0,0 +1 @@
+../debian-qt5/nymea-mqtt-tests.install
\ No newline at end of file
diff --git a/debian-qt6/rules b/debian-qt6/rules
new file mode 100755
index 0000000..df51e45
--- /dev/null
+++ b/debian-qt6/rules
@@ -0,0 +1,25 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+export DH_VERBOSE=1
+
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+PREPROCESS_FILES := $(wildcard debian/*.in)
+
+$(PREPROCESS_FILES:.in=): %: %.in
+	sed 's,/@DEB_HOST_MULTIARCH@,$(DEB_HOST_MULTIARCH:%=/%),g' $< > $@
+
+
+override_dh_install: $(PREPROCESS_FILES:.in=)
+	dh_install
+
+override_dh_auto_test:
+	LD_LIBRARY_PATH=`pwd`/libnymea-mqtt/ dh_auto_test -- -k TESTARGS="-o -,txt -o test-results.xml,xunitxml"
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -rf $(PREPROCESS_FILES:.in=)
+
+%:
+	dh $@ --buildsystem=qmake6 --parallel
diff --git a/debian-qt6/source b/debian-qt6/source
new file mode 120000
index 0000000..1eac8ea
--- /dev/null
+++ b/debian-qt6/source
@@ -0,0 +1 @@
+../debian-qt5/source
\ No newline at end of file