diff --git a/Makefile b/Makefile
index dcf9c82..4e3f751 100644
--- a/Makefile
+++ b/Makefile
@@ -13,11 +13,9 @@ MEDIAWIKI_PACKAGE=pve-docs-mediawiki
 
 GITVERSION:=$(shell git rev-parse HEAD)
 
-ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
-
-GEN_DEB=$(GEN_PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_$(ARCH).deb
-DOC_DEB=$(DOC_PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_all.deb
-MEDIAWIKI_DEB=$(MEDIAWIKI_PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_all.deb
+GEN_DEB=$(GEN_PACKAGE)_$(DEB_VERSION)_all.deb
+DOC_DEB=$(DOC_PACKAGE)_$(DEB_VERSION)_all.deb
+MEDIAWIKI_DEB=$(MEDIAWIKI_PACKAGE)_$(DEB_VERSION)_all.deb
 
 export SOURCE_DATE_EPOCH ?= $(shell dpkg-parsechangelog -STimestamp)
 SOURCE_DATE_HUMAN := $(shell date -d "@$(SOURCE_DATE_EPOCH)")
diff --git a/debian/control b/debian/control
index 1a79941..a81c6ba 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Standards-Version: 4.6.2
 
 Package: pve-doc-generator
 Section: perl
-Architecture: any
+Architecture: all
 Depends: asciidoc-base,
          libpve-common-perl,
          source-highlight,