diff --git a/Makefile b/Makefile
index eadedd9..afe4202 100644
--- a/Makefile
+++ b/Makefile
@@ -85,12 +85,14 @@ endif
 
 VERSION:=$(BRANCH)$(TAG)
 DEBVERSION:=$(BRANCH)$(TAG)
+LOCALCHANGES:=
 
 ifneq ($(strip $(CHANGES)),)
   # There are local un-committed changes.
   VERSION:=$(VERSION) with local changes
   COMMIT_HASH:=$(COMMIT_HASH) with local changes
   DEBVERSION:=$(DEBVERSION)l
+  LOCALCHANGES:=true
 endif
 
 $(shell echo "#define VERSION \"$(VERSION)\"" > $(BUILD)/version.h.tmp)
@@ -172,8 +174,21 @@ DRIVER_OBJS:=$(patsubst src/%.cc,$(BUILD)/%.o,$(DRIVER_OBJS))
 all: $(BUILD)/wmbusmeters $(BUILD)/wmbusmetersd $(BUILD)/wmbusmeters.g $(BUILD)/wmbusmeters-admin $(BUILD)/testinternals
 
 deb:
-	test -L debian || ln -s deb debian
-	debuild
+	@if [ "$(RELEASE)" = "" ] ; then echo "Usage: make deb TAG=1.9.0" ; exit 1 ; fi
+	@rm -rf packaging
+	@mkdir -p packaging
+	@echo "Checking out tag $(RELEASE)..."
+	@(cd packaging ; git clone $(PWD) wmbusmeters-$(RELEASE) ; cd wmbusmeters-$(RELEASE) ; git -c advice.detachedHead=false checkout tags/$(RELEASE) )
+	@(cd packaging/wmbusmeters-$(RELEASE) ; git show -s --format=%ct > ../release_date )
+	@echo "Removing git history..."
+	@(cd packaging ; rm -rf wmbusmeters-$(RELEASE)/.git )
+	@echo "Setting file timestamps to commit date..."
+	@(cd packaging ; export UT=$$(cat ./release_date) ; find . -exec touch -d "@$$UT" \{\} \; )
+	@echo "Creating orig archive..."
+	@(cd packaging ; tar czf ./wmbusmeters_$(RELEASE).orig.tar.gz wmbusmeters-$(RELEASE) )
+	@echo "Running debbuild..."
+	@(cd packaging/wmbusmeters-$(RELEASE) ; ln -s deb debian; debuild )
+
 
 # Check docs verifies that all options in the source have been mentioned in the README and in the man page.
 # Also any option not in the source but mentioned in the docs is warned for as well.
diff --git a/deb/changelog b/deb/changelog
index eb7944e..ce7632b 100644
--- a/deb/changelog
+++ b/deb/changelog
@@ -1,4 +1,10 @@
-wmbusmeters (1.3.0-1) stable; urgency=medium
+wmbusmeters (1.9.1-1) unstable; urgency=medium
+
+  * Hoomfy
+
+ -- Fredrik Öhrström <oehrstroem@gmail.com>  Mon, 12 Sep 2022 20:58:30 +0200
+
+wmbusmeters (1.9.0) unstable; urgency=medium
 
   * First package upload (Closes: #998721).
 
diff --git a/deb/control b/deb/control
index 51db2f3..8f7c576 100644
--- a/deb/control
+++ b/deb/control
@@ -1,11 +1,10 @@
 Source: wmbusmeters
 Section: kernel
 Priority: optional
-Maintainer: Petter Reinholdtsen <pere@debian.org>
+Maintainer: Fredrik Öhrström <oehrstroem@gmail.com>
 Build-Depends: debhelper-compat (= 13)
  , librtlsdr-dev
  , libncurses-dev
- , rtl-wmbus
 Standards-Version: 4.5.1
 Homepage: https://github.com/weetmuts/wmbusmeters
 Vcs-Browser: https://github.com/weetmuts/wmbusmeters
@@ -15,7 +14,6 @@ Rules-Requires-Root: no
 Package: wmbusmeters
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
- , rtl-wmbus
 Description: read wireless and wired M-BUS telegrams from utility meters
  Receives and decodes C1,T1 or S1 telegrams (using
  the wireless or wired mbus protocol) to acquire utility meter
diff --git a/deb/source/format b/deb/source/format
index 163aaf8..89ae9db 100644
--- a/deb/source/format
+++ b/deb/source/format
@@ -1 +1 @@
-3.0 (quilt)
+3.0 (native)