diff --git a/Makefile b/Makefile
index 492c5b5..84edc89 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION   := `grep "VERSION" g13gui/common.py |awk '{ print $$2 }' |sed 's/'//g'`
+VERSION   := `grep "VERSION" g13gui/common.py |awk '{ print $$3 }' |tr -d "'"`
 GITBRANCH ?= master
 PIPENV    := pipenv
 PYTHON    := `which python3`
@@ -36,19 +36,20 @@ manjaro-install:
 	makepkg -i
 
 debian:
-	export GITBRANCH=master
-	debuild
-	debclean
+	mkdir -p build
+	gbp buildpackage --git-verbose --git-debian-branch=$(GITBRANCH) -us -ui -uc
+	mv ../g13gui_$(VERSION)* build
 
-debian-build:
-	gbp buildpackage --git-debian-branch=$(GITBRANCH)
+debian-install:
+	sudo dpkg -i g13gui_$(VERSION).deb
 
 debian-clean:
 	debclean
+	rm -rf build
 
 debian-build-source: debian-clean
-	gbp buildpackage -S --git-debian-branch=$(GITBRANCH)
-	mkdir build
+	mkdir -p build
+	gbp buildpackage -S --git-verbose --git-debian-branch=$(GITBRANCH) -us -uc
 	mv ../g13gui_$(VERSION)* build
 
 debian-release: debian-build-source
diff --git a/debian/changelog b/debian/changelog
index b8379b5..bdaf350 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-g13 (0.1.0ubuntu1) focal; urgency=medium
+g13gui (0.1.0ubuntu1) focal; urgency=medium
 
   * Initial release of the Debian packaging for g13gui
 
diff --git a/debian/control b/debian/control
index 875f410..20a7bb6 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: g13
+Source: g13gui
 Section: misc
 Priority: optional
 Maintainer: June Tate-Gans <june@theonelab.com>
@@ -12,7 +12,7 @@ Homepage: https://github.com/jtgans/g13gui
 Vcs-Browser: https://github.com/jtgans/g13gui
 Vcs-Git: https://github.com/jtgans/g13gui.git
 
-Package: g13
+Package: g13gui
 Architecture: all
 Depends: ${misc:Depends},
          ${python3:Depends},
diff --git a/debian/copyright b/debian/copyright
index 92dbea0..921d016 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,5 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: g13
+Upstream-Name: g13gui
 Upstream-Contact: June Tate-Gans <june@theonelab.com>
 Upstream-Source: https://github.com/jtgans/g13gui