diff --git a/copyright b/copyright
new file mode 100644
index 0000000..a881845
--- /dev/null
+++ b/copyright
@@ -0,0 +1,24 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: nymea-remoteproxy
+Upstream-Contact: Simon Stürz <simon.stuerz@guh.io>
+Copyright: 2018, guh GmbH
+Download: http://www.github.com/guh/nymea-remoteproxy
+Source: https://github.com/guh/nymea-remoteproxy.git
+
+
+License: GPL-2+
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
+
+License: LGPL-2.1
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
+
+License: LGPL-3
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License can be found in `/usr/share/common-licenses/LGPL-3'.
+
+
+Files: *
+License: GPL-2+
+Copyright: 2018, Simon Stürz <simon.stuerz@guh.io>
diff --git a/debian/control b/debian/control
index 0bf0738..f59b7ed 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: nymea-remoteproxy
 Section: utils
 Priority: options
-Maintainer: Michael Zanetti <michael.zanetti@guh.io>
+Maintainer: Simon Stürz <simon.stürz@guh.io>
 Build-depends: debhelper (>= 0.0.0),
     libqt5websockets5-dev,
 Standards-Version: 3.9.3
@@ -13,19 +13,19 @@ Depends: ${shlibs:Depends},
 Description: The nymea remote proxy server
   The nymea remote proxy server
 
-Package: libnymea-remoteproxy
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-Description: The nymea remote proxy server
-  The nymea remote proxy server
-
 Package: libnymea-remoteproxyclient
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-Description: The nymea remote proxy server
-  The nymea remote proxy server
+Description: The nymea remote proxy server client lib
+  The nymea remote proxy server client lib
+
+Package: libnymea-remoteproxyclient-dev
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+Description: The nymea remote proxy server client lib, development files
+  The nymea remote proxy server client lib, development files
 
 Package: nymea-remoteproxy-tests
 Architecture: any
diff --git a/debian/libnymea-remoteproxy.install b/debian/libnymea-remoteproxy.install
deleted file mode 100644
index 5833199..0000000
--- a/debian/libnymea-remoteproxy.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libnymea-remoteproxy.so*
diff --git a/debian/libnymea-remoteproxyclient.install b/debian/libnymea-remoteproxyclient.install
deleted file mode 100644
index 894b860..0000000
--- a/debian/libnymea-remoteproxyclient.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libnymea-remoteproxyclient.so*
diff --git a/debian/libnymea-remoteproxyclient.install.in b/debian/libnymea-remoteproxyclient.install.in
new file mode 100644
index 0000000..8067a26
--- /dev/null
+++ b/debian/libnymea-remoteproxyclient.install.in
@@ -0,0 +1 @@
+usr/lib/@DEB_HOST_MULTIARCH@/libnymea-remoteproxyclient.so.*
diff --git a/debian/nymea-remoteproxy.install b/debian/nymea-remoteproxy.install
deleted file mode 100644
index 3563d18..0000000
--- a/debian/nymea-remoteproxy.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/nymea-remoteproxy
diff --git a/debian/nymea-remoteproxy.install.in b/debian/nymea-remoteproxy.install.in
new file mode 100644
index 0000000..b0bd768
--- /dev/null
+++ b/debian/nymea-remoteproxy.install.in
@@ -0,0 +1,2 @@
+usr/lib/@DEB_HOST_MULTIARCH@/libnymea-remoteproxy.so*
+usr/bin/nymea-remoteproxy
diff --git a/debian/rules b/debian/rules
index 6e863b9..b21fc88 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,16 +2,14 @@
 
 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
+
 %:
 	dh $@
-
-#override_dh_auto_build:
-#	JANUSP=/usr make -j1
-
-#override_dh_auto_install:
-#	install build/janus_guhio.so debian/janus-guh-plugin/lib/$(DEB_HOST_MULTIARCH)/janus/plugins/
-#	install -m 0644 conf/janus.plugin.guhio.cfg debian/janus-guh-plugin/etc/janus/
-
-override_dh_auto_check:
-	LD_LIBRARY_PATH=libnymea-remoteproxy dh_auto_check
-
diff --git a/libnymea-remoteproxy/libnymea-remoteproxy.pro b/libnymea-remoteproxy/libnymea-remoteproxy.pro
index 546b810..a0867aa 100644
--- a/libnymea-remoteproxy/libnymea-remoteproxy.pro
+++ b/libnymea-remoteproxy/libnymea-remoteproxy.pro
@@ -56,5 +56,5 @@ for(header, HEADERS) {
     eval(INSTALLS *= headers_$${path})
 }
 
-target.path = /usr/lib/
+target.path = /usr/lib/$$system('dpkg-architecture -q DEB_HOST_MULTIARCH')
 INSTALLS += target
diff --git a/libnymea-remoteproxyclient/libnymea-remoteproxyclient.pro b/libnymea-remoteproxyclient/libnymea-remoteproxyclient.pro
index 6b6172c..d9a3f1d 100644
--- a/libnymea-remoteproxyclient/libnymea-remoteproxyclient.pro
+++ b/libnymea-remoteproxyclient/libnymea-remoteproxyclient.pro
@@ -2,7 +2,7 @@ include(../nymea-remoteproxy.pri)
 
 TEMPLATE = lib
 TARGET = nymea-remoteproxyclient
-target.path = /usr/lib/
+target.path = /usr/lib/$$system('dpkg-architecture -q DEB_HOST_MULTIARCH')
 
 include(libnymea-remoteproxyclient.pri)