diff --git a/Makefile b/Makefile
index db644b5..a16cbdb 100644
--- a/Makefile
+++ b/Makefile
@@ -4,38 +4,38 @@ include /usr/share/dpkg/architecture.mk
 PACKAGE=spiceterm
 
 GITVERSION:=$(shell cat .git/refs/heads/master)
-BUILDDIR ?= ${PACKAGE}-${DEB_VERSION_UPSTREAM}
+BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION_UPSTREAM)
 
 export VERSION=$(DEB_VERSION_UPSTREAM)
 
-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
 
-${BUILDDIR}: src/ debian/
+$(BUILDDIR): src/ debian/
 	rm -rf $(BUILDDIR)
 	rsync -a src/ debian $(BUILDDIR)
-	echo "git clone git://git.proxmox.com/git/spiceterm.git\\ngit checkout ${GITVERSION}" > $(BUILDDIR)/debian/SOURCE
+	echo "git clone git://git.proxmox.com/git/spiceterm.git\\ngit checkout $(GITVERSION)" > $(BUILDDIR)/debian/SOURCE
 
 .PHONY: dsc
-dsc: ${DSC}
-${DSC}: $(BUILDDIR)
+dsc: $(DSC)
+$(DSC): $(BUILDDIR)
 	cd $(BUILDDIR); dpkg-buildpackage -S -us -uc -d
-	lintian ${DSC}
+	lintian $(DSC)
 
 .PHONY: deb
-deb: ${DEB}
-${DEB}: $(BUILDDIR)
+deb: $(DEB)
+$(DEB): $(BUILDDIR)
 	cd $(BUILDDIR); dpkg-buildpackage -b -us -uc
-	lintian ${DEB}
+	lintian $(DEB)
 
 .PHONY: dinstall
-dinstall: ${DEB}
-	dpkg -i ${DEB}
+dinstall: $(DEB)
+	dpkg -i $(DEB)
 
 .PHONY: upload
-upload: ${DEB}
-	tar cf - ${DEB} ${DBG_DEB} | ssh repoman@repo.proxmox.com -- upload --product pve --dist bullseye --arch ${ARCH}
+upload: $(DEB)
+	tar cf - $(DEB) $(DBG_DEB) | ssh repoman@repo.proxmox.com -- upload --product pve --dist bullseye --arch $(ARCH)
 
 .PHONY: distclean clean
 distclean: clean
diff --git a/src/Makefile b/src/Makefile
index 0c9c007..2621df0 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -10,10 +10,10 @@ LIBS += `pkg-config --libs $(PKGS)`
 #export G_MESSAGES_DEBUG=all
 #export SPICE_DEBUG=1
 
-all: ${PROGRAMS}
+all: $(PROGRAMS)
 
-spiceterm: ${SOURCES} ${HEADERS} spiceterm.c
-	gcc -Werror -Wall -Wl,-z,relro -Wtype-limits ${SOURCES} -g -O2 $(CFLAGS) -o $@ -lutil $(LIBS)
+spiceterm: $(SOURCES) $(HEADERS) spiceterm.c
+	gcc -Werror -Wall -Wl,-z,relro -Wtype-limits $(SOURCES) -g -O2 $(CFLAGS) -o $@ -lutil $(LIBS)
 
 genfont: genfont.c
 	gcc -g -O2 -o $@ genfont.c -Wall -D_GNU_SOURCE -lz
@@ -27,14 +27,14 @@ glyphs: genfont
 
 spiceterm.1: spiceterm.pod
 	rm -f $@
-	pod2man -n $< -s 1 -r ${VERSION} <$< >$@
+	pod2man -n $< -s 1 -r $(VERSION) <$< >$@
 
 .PHONY: install
 install: spiceterm spiceterm.1
-	mkdir -p ${DESTDIR}/usr/share/man/man1
-	install -m 0644 spiceterm.1 ${DESTDIR}/usr/share/man/man1
-	mkdir -p ${DESTDIR}/usr/bin
-	install -m 0755 spiceterm ${DESTDIR}/usr/bin
+	mkdir -p $(DESTDIR)/usr/share/man/man1
+	install -m 0644 spiceterm.1 $(DESTDIR)/usr/share/man/man1
+	mkdir -p $(DESTDIR)/usr/bin
+	install -m 0755 spiceterm $(DESTDIR)/usr/bin
 
 .PHONY: test
 test: spiceterm