diff --git a/Makefile b/Makefile
index 5a883c6d..c780d4f3 100644
--- a/Makefile
+++ b/Makefile
@@ -2,28 +2,28 @@ include /usr/share/dpkg/pkg-info.mk
 include /usr/share/dpkg/architecture.mk
 
 PACKAGE=qemu-server
-BUILDDIR ?= ${PACKAGE}-${DEB_VERSION_UPSTREAM}
+BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION_UPSTREAM)
 
 DESTDIR=
 PREFIX=/usr
-SBINDIR=${PREFIX}/sbin
-LIBDIR=${PREFIX}/lib/${PACKAGE}
-MANDIR=${PREFIX}/share/man
-DOCDIR=${PREFIX}/share/doc
-MAN1DIR=${MANDIR}/man1/
-MAN5DIR=${MANDIR}/man5/
-BASHCOMPLDIR=${PREFIX}/share/bash-completion/completions/
-ZSHCOMPLDIR=${PREFIX}/share/zsh/vendor-completions/
-export PERLDIR=${PREFIX}/share/perl5
-PERLINCDIR=${PERLDIR}/asm-x86_64
+SBINDIR=$(PREFIX)/sbin
+LIBDIR=$(PREFIX)/lib/$(PACKAGE)
+MANDIR=$(PREFIX)/share/man
+DOCDIR=$(PREFIX)/share/doc
+MAN1DIR=$(MANDIR)/man1/
+MAN5DIR=$(MANDIR)/man5/
+BASHCOMPLDIR=$(PREFIX)/share/bash-completion/completions/
+ZSHCOMPLDIR=$(PREFIX)/share/zsh/vendor-completions/
+export PERLDIR=$(PREFIX)/share/perl5
+PERLINCDIR=$(PERLDIR)/asm-x86_64
 
 GITVERSION:=$(shell git rev-parse HEAD)
 
-DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_${DEB_BUILD_ARCH}.deb
-DBG_DEB=${PACKAGE}-dbgsym_${DEB_VERSION_UPSTREAM_REVISION}_${DEB_BUILD_ARCH}.deb
-DSC=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}.dsc
+DEB=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_$(DEB_BUILD_ARCH).deb
+DBG_DEB=$(PACKAGE)-dbgsym_$(DEB_VERSION_UPSTREAM_REVISION)_$(DEB_BUILD_ARCH).deb
+DSC=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION).dsc
 
-DEBS=${DEB} ${DBG_DEB}
+DEBS=$(DEB) $(DBG_DEB)
 
 # this requires package pve-doc-generator
 export NOVIEW=1
@@ -33,7 +33,7 @@ all:
 
 .PHONY: dinstall
 dinstall: deb
-	dpkg -i ${DEB}
+	dpkg -i $(DEB)
 
 qm.bash-completion:
 	PVE_GENERATING_DOCS=1 perl -I. -T -e "use PVE::CLI::qm; PVE::CLI::qm->generate_bash_completions();" >$@.tmp
@@ -55,48 +55,48 @@ PKGSOURCES=qm qm.1 qmrestore qmrestore.1 qmextract qm.conf.5 qm.bash-completion
 	    qm.zsh-completion qmrestore.zsh-completion cpu-models.conf.5
 
 .PHONY: install
-install: ${PKGSOURCES}
-	install -d ${DESTDIR}/${SBINDIR}
-	install -d ${DESTDIR}${LIBDIR}
-	install -d ${DESTDIR}/${MAN1DIR}
-	install -d ${DESTDIR}/${MAN5DIR}
-	install -d ${DESTDIR}/usr/share/${PACKAGE}
-	install -m 0644 -D qm.bash-completion ${DESTDIR}/${BASHCOMPLDIR}/qm
-	install -m 0644 -D qmrestore.bash-completion ${DESTDIR}/${BASHCOMPLDIR}/qmrestore
-	install -m 0644 -D qm.zsh-completion ${DESTDIR}/${ZSHCOMPLDIR}/_qm
-	install -m 0644 -D qmrestore.zsh-completion ${DESTDIR}/${ZSHCOMPLDIR}/_qmrestore
-	install -m 0644 -D bootsplash.jpg ${DESTDIR}/usr/share/${PACKAGE}
+install: $(PKGSOURCES)
+	install -d $(DESTDIR)/$(SBINDIR)
+	install -d $(DESTDIR)$(LIBDIR)
+	install -d $(DESTDIR)/$(MAN1DIR)
+	install -d $(DESTDIR)/$(MAN5DIR)
+	install -d $(DESTDIR)/usr/share/$(PACKAGE)
+	install -m 0644 -D qm.bash-completion $(DESTDIR)/$(BASHCOMPLDIR)/qm
+	install -m 0644 -D qmrestore.bash-completion $(DESTDIR)/$(BASHCOMPLDIR)/qmrestore
+	install -m 0644 -D qm.zsh-completion $(DESTDIR)/$(ZSHCOMPLDIR)/_qm
+	install -m 0644 -D qmrestore.zsh-completion $(DESTDIR)/$(ZSHCOMPLDIR)/_qmrestore
+	install -m 0644 -D bootsplash.jpg $(DESTDIR)/usr/share/$(PACKAGE)
 	$(MAKE) -C PVE install
 	$(MAKE) -C qmeventd install
 	$(MAKE) -C qemu-configs install
 	$(MAKE) -C vm-network-scripts install
-	install -m 0755 qm ${DESTDIR}${SBINDIR}
-	install -m 0755 qmrestore ${DESTDIR}${SBINDIR}
-	install -D -m 0644 modules-load.conf ${DESTDIR}/etc/modules-load.d/qemu-server.conf
-	install -m 0755 qmextract ${DESTDIR}${LIBDIR}
-	install -m 0644 qm.1 ${DESTDIR}/${MAN1DIR}
-	install -m 0644 qmrestore.1 ${DESTDIR}/${MAN1DIR}
-	install -m 0644 cpu-models.conf.5 ${DESTDIR}/${MAN5DIR}
-	install -m 0644 qm.conf.5 ${DESTDIR}/${MAN5DIR}
-	cd ${DESTDIR}/${MAN5DIR}; ln -s -f qm.conf.5.gz vm.conf.5.gz
+	install -m 0755 qm $(DESTDIR)$(SBINDIR)
+	install -m 0755 qmrestore $(DESTDIR)$(SBINDIR)
+	install -D -m 0644 modules-load.conf $(DESTDIR)/etc/modules-load.d/qemu-server.conf
+	install -m 0755 qmextract $(DESTDIR)$(LIBDIR)
+	install -m 0644 qm.1 $(DESTDIR)/$(MAN1DIR)
+	install -m 0644 qmrestore.1 $(DESTDIR)/$(MAN1DIR)
+	install -m 0644 cpu-models.conf.5 $(DESTDIR)/$(MAN5DIR)
+	install -m 0644 qm.conf.5 $(DESTDIR)/$(MAN5DIR)
+	cd $(DESTDIR)/$(MAN5DIR); ln -s -f qm.conf.5.gz vm.conf.5.gz
 
-${BUILDDIR}:
+$(BUILDDIR):
 	rm -rf $(BUILDDIR)
 	rsync -a * $(BUILDDIR)
 	echo "git clone git://git.proxmox.com/git/qemu-server.git\\ngit checkout $(GITVERSION)" > $(BUILDDIR)/debian/SOURCE
 
 .PHONY: deb
-deb: ${DEBS}
-${DBG_DEB}: ${DEB}
-${DEB}: $(BUILDDIR)
+deb: $(DEBS)
+$(DBG_DEB): $(DEB)
+$(DEB): $(BUILDDIR)
 	cd $(BUILDDIR); dpkg-buildpackage -b -us -uc
-	lintian ${DEBS}
+	lintian $(DEBS)
 
 .PHONY: dsc
-dsc: ${DSC}
-${DSC}: ${BUILDDIR}
-	cd ${BUILDDIR}; dpkg-buildpackage -S -us -uc -d
-	lintian ${DSC}
+dsc: $(DSC)
+$(DSC): $(BUILDDIR)
+	cd $(BUILDDIR); dpkg-buildpackage -S -us -uc -d
+	lintian $(DSC)
 
 .PHONY: test
 test:
@@ -105,8 +105,8 @@ test:
 
 .PHONY: upload
 upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
-upload: ${DEB}
-	tar cf - ${DEBS} | ssh -X repoman@repo.proxmox.com upload --product pve --dist $(UPLOAD_DIST)
+upload: $(DEB)
+	tar cf - $(DEBS) | ssh -X repoman@repo.proxmox.com upload --product pve --dist $(UPLOAD_DIST)
 
 .PHONY: clean
 clean: