diff --git a/Makefile b/Makefile
index fe676fd..c0d11b7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,22 +1,22 @@
 TODAY != date '+%Y%M%d'
 
 VERSION := $(TODAY)-1
-V_x86_64 := $(VERSION)_x86_64
+V_amd64  := $(VERSION)_amd64
 V_i686   := $(VERSION)_i686
 
 PERL := perl -I.
 
 all:
 	@echo The following targets are available:
-	@echo '  $(MAKE) base-x86_64'
+	@echo '  $(MAKE) base-amd64'
 	@echo '  $(MAKE) base-i686'
-	@echo '  $(MAKE) default           (same as make base-x86_64)'
+	@echo '  $(MAKE) default           (same as make base-amd64)'
 
 .PHONY: default
-default: base-x86_64
+default: base-amd64
 
 # we should always regenerate this:
-.PHONY: aab.conf aab.conf.x86_64 aab.conf.i686
+.PHONY: aab.conf aab.conf.amd64 aab.conf.i686
 aab.conf:
 	echo 'Name: archlinux-base' > aab.conf
 	echo 'Version: $(VERSION)' >> aab.conf
@@ -24,14 +24,14 @@ aab.conf:
 	echo 'Maintainer: Proxmox Support Team <support@proxmox.com>' >> aab.conf
 	echo 'Source: http://archlinux.cu.be/$$repo/os/$$arch' >> aab.conf
 
-aab.conf.x86_64: aab.conf
-	echo 'Architecture: x86_64' >> aab.conf
+aab.conf.amd64: aab.conf
+	echo 'Architecture: amd64' >> aab.conf
 aab.conf.i686: aab.conf
 	echo 'Architecture: i686' >> aab.conf
 
-.PHONY: base-x86_64
-base-x86_64: archlinux-base_$(V_x86_64).tar.gz
-archlinux-base_$(V_x86_64).tar.gz: aab.conf.x86_64
+.PHONY: base-amd64
+base-amd64: archlinux-base_$(V_amd64).tar.gz
+archlinux-base_$(V_amd64).tar.gz: aab.conf.amd64
 	echo 'Headline: ArchLinux base image.' >> aab.conf
 	$(MAKE) build-current
 
diff --git a/PVE/AAB.pm b/PVE/AAB.pm
index 44370e1..a75133e 100644
--- a/PVE/AAB.pm
+++ b/PVE/AAB.pm
@@ -117,6 +117,8 @@ sub read_config {
 
     die "unable to parse config file" if $rec;
 
+    $res->{architecture} = 'amd64' if $res->{architecture} eq 'x86_64';
+
     return $res;
 }
 
@@ -236,10 +238,12 @@ sub initialize {
 
     $fh = IO::File->new($self->{'pacman.conf'}, O_WRONLY|O_CREAT|O_EXCL) ||
 	die "unable to write pacman config file $self->{'pacman.conf'} - $!";
+    my $arch = $config->{architecture};
+    $arch = 'x86_64' if $arch eq 'amd64';
     print $fh <<"EOF";
 [options]
 HoldPkg = pacman glibc
-Architecture = $config->{architecture}
+Architecture = $arch
 CheckSpace
 SigLevel = Never