diff --git a/CMakeLists.txt b/CMakeLists.txt
index 76774f4b0..c29948853 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,8 +63,8 @@ add_subdirectory(arch/aarch64)
 list(APPEND KERNEL_OBJECTS
 	$<TARGET_OBJECTS:${AARCH64_KERNEL_C_TARGET}>)
 else()
-# add arch/x86 and its objects
-add_subdirectory(arch/x86)
+# add arch/x86_64 and its objects
+add_subdirectory(arch/x86_64)
 list(APPEND KERNEL_OBJECTS
 	$<TARGET_OBJECTS:${X86_KERNEL_ASM_TARGET}>
 	$<TARGET_OBJECTS:${X86_KERNEL_C_TARGET}>)
@@ -154,7 +154,7 @@ build_external(tools ${HERMIT_ROOT}/tools "")
 
 if("${TARGET_ARCH}" STREQUAL "x86_64-hermit")
 
-build_external(arch_x86_loader ${HERMIT_ROOT}/arch/x86/loader "")
+build_external(arch_x86_loader ${HERMIT_ROOT}/arch/x86_64/loader "")
 
 ## Intel's OpenMP runtime for x86 (libomp)
 build_external(libiomp ${HERMIT_ROOT}/usr/libomp ""
diff --git a/arch/x86/CMakeLists.txt b/arch/x86_64/CMakeLists.txt
similarity index 100%
rename from arch/x86/CMakeLists.txt
rename to arch/x86_64/CMakeLists.txt
diff --git a/arch/x86/include/asm/apic.h b/arch/x86_64/include/asm/apic.h
similarity index 100%
rename from arch/x86/include/asm/apic.h
rename to arch/x86_64/include/asm/apic.h
diff --git a/arch/x86/include/asm/atomic.h b/arch/x86_64/include/asm/atomic.h
similarity index 100%
rename from arch/x86/include/asm/atomic.h
rename to arch/x86_64/include/asm/atomic.h
diff --git a/arch/x86/include/asm/atomic32.h b/arch/x86_64/include/asm/atomic32.h
similarity index 100%
rename from arch/x86/include/asm/atomic32.h
rename to arch/x86_64/include/asm/atomic32.h
diff --git a/arch/x86/include/asm/atomic64.h b/arch/x86_64/include/asm/atomic64.h
similarity index 100%
rename from arch/x86/include/asm/atomic64.h
rename to arch/x86_64/include/asm/atomic64.h
diff --git a/arch/x86/include/asm/gdt.h b/arch/x86_64/include/asm/gdt.h
similarity index 100%
rename from arch/x86/include/asm/gdt.h
rename to arch/x86_64/include/asm/gdt.h
diff --git a/arch/x86/include/asm/idt.h b/arch/x86_64/include/asm/idt.h
similarity index 100%
rename from arch/x86/include/asm/idt.h
rename to arch/x86_64/include/asm/idt.h
diff --git a/arch/x86/include/asm/io.h b/arch/x86_64/include/asm/io.h
similarity index 100%
rename from arch/x86/include/asm/io.h
rename to arch/x86_64/include/asm/io.h
diff --git a/arch/x86/include/asm/irq.h b/arch/x86_64/include/asm/irq.h
similarity index 100%
rename from arch/x86/include/asm/irq.h
rename to arch/x86_64/include/asm/irq.h
diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86_64/include/asm/irqflags.h
similarity index 100%
rename from arch/x86/include/asm/irqflags.h
rename to arch/x86_64/include/asm/irqflags.h
diff --git a/arch/x86/include/asm/isrs.h b/arch/x86_64/include/asm/isrs.h
similarity index 100%
rename from arch/x86/include/asm/isrs.h
rename to arch/x86_64/include/asm/isrs.h
diff --git a/arch/x86/include/asm/limits.h b/arch/x86_64/include/asm/limits.h
similarity index 100%
rename from arch/x86/include/asm/limits.h
rename to arch/x86_64/include/asm/limits.h
diff --git a/arch/x86/include/asm/multiboot.h b/arch/x86_64/include/asm/multiboot.h
similarity index 100%
rename from arch/x86/include/asm/multiboot.h
rename to arch/x86_64/include/asm/multiboot.h
diff --git a/arch/x86/include/asm/page.h b/arch/x86_64/include/asm/page.h
similarity index 100%
rename from arch/x86/include/asm/page.h
rename to arch/x86_64/include/asm/page.h
diff --git a/arch/x86/include/asm/pci.h b/arch/x86_64/include/asm/pci.h
similarity index 100%
rename from arch/x86/include/asm/pci.h
rename to arch/x86_64/include/asm/pci.h
diff --git a/arch/x86/include/asm/processor.h b/arch/x86_64/include/asm/processor.h
similarity index 100%
rename from arch/x86/include/asm/processor.h
rename to arch/x86_64/include/asm/processor.h
diff --git a/arch/x86/include/asm/stddef.h b/arch/x86_64/include/asm/stddef.h
similarity index 100%
rename from arch/x86/include/asm/stddef.h
rename to arch/x86_64/include/asm/stddef.h
diff --git a/arch/x86/include/asm/string.h b/arch/x86_64/include/asm/string.h
similarity index 100%
rename from arch/x86/include/asm/string.h
rename to arch/x86_64/include/asm/string.h
diff --git a/arch/x86/include/asm/tasks.h b/arch/x86_64/include/asm/tasks.h
similarity index 100%
rename from arch/x86/include/asm/tasks.h
rename to arch/x86_64/include/asm/tasks.h
diff --git a/arch/x86/include/asm/tasks_types.h b/arch/x86_64/include/asm/tasks_types.h
similarity index 100%
rename from arch/x86/include/asm/tasks_types.h
rename to arch/x86_64/include/asm/tasks_types.h
diff --git a/arch/x86/include/asm/time.h b/arch/x86_64/include/asm/time.h
similarity index 100%
rename from arch/x86/include/asm/time.h
rename to arch/x86_64/include/asm/time.h
diff --git a/arch/x86/include/asm/tss.h b/arch/x86_64/include/asm/tss.h
similarity index 100%
rename from arch/x86/include/asm/tss.h
rename to arch/x86_64/include/asm/tss.h
diff --git a/arch/x86/include/asm/uart.h b/arch/x86_64/include/asm/uart.h
similarity index 100%
rename from arch/x86/include/asm/uart.h
rename to arch/x86_64/include/asm/uart.h
diff --git a/arch/x86/include/asm/uhyve.h b/arch/x86_64/include/asm/uhyve.h
similarity index 100%
rename from arch/x86/include/asm/uhyve.h
rename to arch/x86_64/include/asm/uhyve.h
diff --git a/arch/x86/kernel/apic.c b/arch/x86_64/kernel/apic.c
similarity index 100%
rename from arch/x86/kernel/apic.c
rename to arch/x86_64/kernel/apic.c
diff --git a/arch/x86/kernel/boot.asm b/arch/x86_64/kernel/boot.asm
similarity index 100%
rename from arch/x86/kernel/boot.asm
rename to arch/x86_64/kernel/boot.asm
diff --git a/arch/x86/kernel/entry.asm b/arch/x86_64/kernel/entry.asm
similarity index 100%
rename from arch/x86/kernel/entry.asm
rename to arch/x86_64/kernel/entry.asm
diff --git a/arch/x86/kernel/gdt.c b/arch/x86_64/kernel/gdt.c
similarity index 100%
rename from arch/x86/kernel/gdt.c
rename to arch/x86_64/kernel/gdt.c
diff --git a/arch/x86/kernel/idt.c b/arch/x86_64/kernel/idt.c
similarity index 100%
rename from arch/x86/kernel/idt.c
rename to arch/x86_64/kernel/idt.c
diff --git a/arch/x86/kernel/irq.c b/arch/x86_64/kernel/irq.c
similarity index 100%
rename from arch/x86/kernel/irq.c
rename to arch/x86_64/kernel/irq.c
diff --git a/arch/x86/kernel/isrs.c b/arch/x86_64/kernel/isrs.c
similarity index 100%
rename from arch/x86/kernel/isrs.c
rename to arch/x86_64/kernel/isrs.c
diff --git a/arch/x86/kernel/pci.c b/arch/x86_64/kernel/pci.c
similarity index 100%
rename from arch/x86/kernel/pci.c
rename to arch/x86_64/kernel/pci.c
diff --git a/arch/x86/kernel/pcihdr.h b/arch/x86_64/kernel/pcihdr.h
similarity index 100%
rename from arch/x86/kernel/pcihdr.h
rename to arch/x86_64/kernel/pcihdr.h
diff --git a/arch/x86/kernel/processor.c b/arch/x86_64/kernel/processor.c
similarity index 100%
rename from arch/x86/kernel/processor.c
rename to arch/x86_64/kernel/processor.c
diff --git a/arch/x86/kernel/signal.c b/arch/x86_64/kernel/signal.c
similarity index 100%
rename from arch/x86/kernel/signal.c
rename to arch/x86_64/kernel/signal.c
diff --git a/arch/x86/kernel/syscall.c b/arch/x86_64/kernel/syscall.c
similarity index 100%
rename from arch/x86/kernel/syscall.c
rename to arch/x86_64/kernel/syscall.c
diff --git a/arch/x86/kernel/tasks.c b/arch/x86_64/kernel/tasks.c
similarity index 100%
rename from arch/x86/kernel/tasks.c
rename to arch/x86_64/kernel/tasks.c
diff --git a/arch/x86/kernel/timer.c b/arch/x86_64/kernel/timer.c
similarity index 100%
rename from arch/x86/kernel/timer.c
rename to arch/x86_64/kernel/timer.c
diff --git a/arch/x86/kernel/uart.c b/arch/x86_64/kernel/uart.c
similarity index 100%
rename from arch/x86/kernel/uart.c
rename to arch/x86_64/kernel/uart.c
diff --git a/arch/x86/libkern/string.asm b/arch/x86_64/libkern/string.asm
similarity index 100%
rename from arch/x86/libkern/string.asm
rename to arch/x86_64/libkern/string.asm
diff --git a/arch/x86/loader/CMakeLists.txt b/arch/x86_64/loader/CMakeLists.txt
similarity index 100%
rename from arch/x86/loader/CMakeLists.txt
rename to arch/x86_64/loader/CMakeLists.txt
diff --git a/arch/x86/loader/entry.asm b/arch/x86_64/loader/entry.asm
similarity index 100%
rename from arch/x86/loader/entry.asm
rename to arch/x86_64/loader/entry.asm
diff --git a/arch/x86/loader/include/ctype.h b/arch/x86_64/loader/include/ctype.h
similarity index 100%
rename from arch/x86/loader/include/ctype.h
rename to arch/x86_64/loader/include/ctype.h
diff --git a/arch/x86/loader/include/elf.h b/arch/x86_64/loader/include/elf.h
similarity index 100%
rename from arch/x86/loader/include/elf.h
rename to arch/x86_64/loader/include/elf.h
diff --git a/arch/x86/loader/include/io.h b/arch/x86_64/loader/include/io.h
similarity index 100%
rename from arch/x86/loader/include/io.h
rename to arch/x86_64/loader/include/io.h
diff --git a/arch/x86/loader/include/limits.h b/arch/x86_64/loader/include/limits.h
similarity index 100%
rename from arch/x86/loader/include/limits.h
rename to arch/x86_64/loader/include/limits.h
diff --git a/arch/x86/loader/include/multiboot.h b/arch/x86_64/loader/include/multiboot.h
similarity index 100%
rename from arch/x86/loader/include/multiboot.h
rename to arch/x86_64/loader/include/multiboot.h
diff --git a/arch/x86/loader/include/page.h b/arch/x86_64/loader/include/page.h
similarity index 100%
rename from arch/x86/loader/include/page.h
rename to arch/x86_64/loader/include/page.h
diff --git a/arch/x86/loader/include/stdarg.h b/arch/x86_64/loader/include/stdarg.h
similarity index 100%
rename from arch/x86/loader/include/stdarg.h
rename to arch/x86_64/loader/include/stdarg.h
diff --git a/arch/x86/loader/include/stddef.h b/arch/x86_64/loader/include/stddef.h
similarity index 100%
rename from arch/x86/loader/include/stddef.h
rename to arch/x86_64/loader/include/stddef.h
diff --git a/arch/x86/loader/include/stdio.h b/arch/x86_64/loader/include/stdio.h
similarity index 100%
rename from arch/x86/loader/include/stdio.h
rename to arch/x86_64/loader/include/stdio.h
diff --git a/arch/x86/loader/include/string.h b/arch/x86_64/loader/include/string.h
similarity index 100%
rename from arch/x86/loader/include/string.h
rename to arch/x86_64/loader/include/string.h
diff --git a/arch/x86/loader/include/uart.h b/arch/x86_64/loader/include/uart.h
similarity index 100%
rename from arch/x86/loader/include/uart.h
rename to arch/x86_64/loader/include/uart.h
diff --git a/arch/x86/loader/link.ld b/arch/x86_64/loader/link.ld
similarity index 100%
rename from arch/x86/loader/link.ld
rename to arch/x86_64/loader/link.ld
diff --git a/arch/x86/loader/main.c b/arch/x86_64/loader/main.c
similarity index 100%
rename from arch/x86/loader/main.c
rename to arch/x86_64/loader/main.c
diff --git a/arch/x86/loader/page.c b/arch/x86_64/loader/page.c
similarity index 100%
rename from arch/x86/loader/page.c
rename to arch/x86_64/loader/page.c
diff --git a/arch/x86/loader/printf.c b/arch/x86_64/loader/printf.c
similarity index 100%
rename from arch/x86/loader/printf.c
rename to arch/x86_64/loader/printf.c
diff --git a/arch/x86/loader/stdio.c b/arch/x86_64/loader/stdio.c
similarity index 100%
rename from arch/x86/loader/stdio.c
rename to arch/x86_64/loader/stdio.c
diff --git a/arch/x86/loader/string.c b/arch/x86_64/loader/string.c
similarity index 100%
rename from arch/x86/loader/string.c
rename to arch/x86_64/loader/string.c
diff --git a/arch/x86/loader/strstr.c b/arch/x86_64/loader/strstr.c
similarity index 100%
rename from arch/x86/loader/strstr.c
rename to arch/x86_64/loader/strstr.c
diff --git a/arch/x86/loader/strtol.c b/arch/x86_64/loader/strtol.c
similarity index 100%
rename from arch/x86/loader/strtol.c
rename to arch/x86_64/loader/strtol.c
diff --git a/arch/x86/loader/uart.c b/arch/x86_64/loader/uart.c
similarity index 100%
rename from arch/x86/loader/uart.c
rename to arch/x86_64/loader/uart.c
diff --git a/arch/x86/mm/hbmemory.c b/arch/x86_64/mm/hbmemory.c
similarity index 100%
rename from arch/x86/mm/hbmemory.c
rename to arch/x86_64/mm/hbmemory.c
diff --git a/arch/x86/mm/memory.c b/arch/x86_64/mm/memory.c
similarity index 100%
rename from arch/x86/mm/memory.c
rename to arch/x86_64/mm/memory.c
diff --git a/arch/x86/mm/page.c b/arch/x86_64/mm/page.c
similarity index 100%
rename from arch/x86/mm/page.c
rename to arch/x86_64/mm/page.c
diff --git a/arch/x86/mm/vma.c b/arch/x86_64/mm/vma.c
similarity index 100%
rename from arch/x86/mm/vma.c
rename to arch/x86_64/mm/vma.c
diff --git a/cmake/HermitCore-Toolchain-x86-bootstrap.cmake b/cmake/HermitCore-Toolchain-x86_64-bootstrap.cmake
similarity index 77%
rename from cmake/HermitCore-Toolchain-x86-bootstrap.cmake
rename to cmake/HermitCore-Toolchain-x86_64-bootstrap.cmake
index 4471196e2..cc22444c0 100644
--- a/cmake/HermitCore-Toolchain-x86-bootstrap.cmake
+++ b/cmake/HermitCore-Toolchain-x86_64-bootstrap.cmake
@@ -1,4 +1,4 @@
-include(${CMAKE_CURRENT_LIST_DIR}/HermitCore-Toolchain-x86.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/HermitCore-Toolchain-x86_64.cmake)
 include_guard()
 
 set(CMAKE_C_COMPILER_WORKS 1 CACHE INTERNAL "")
diff --git a/cmake/HermitCore-Toolchain-x86.cmake b/cmake/HermitCore-Toolchain-x86_64.cmake
similarity index 100%
rename from cmake/HermitCore-Toolchain-x86.cmake
rename to cmake/HermitCore-Toolchain-x86_64.cmake
diff --git a/cmake/HermitCore.cmake b/cmake/HermitCore.cmake
index 599a522d2..3c638f699 100644
--- a/cmake/HermitCore.cmake
+++ b/cmake/HermitCore.cmake
@@ -8,7 +8,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/HermitCore-Configuration.cmake)
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/golang/)
 
 if(NOT HERMIT_ARCH)
-	set(HERMIT_ARCH x86)
+	execute_process(COMMAND uname -m OUTPUT_VARIABLE HERMIT_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE)
 endif()
 
 if(PROFILING)
@@ -35,7 +35,7 @@ if(NOT CMAKE_TOOLCHAIN_FILE)
 endif()
 
 # NASM is only required on x86_64
-if("${HERMIT_ARCH}" STREQUAL "x86")
+if("${HERMIT_ARCH}" STREQUAL "x86_64")
 # NASM detection will change binary format depending on host system, but
 # we only want to generate elf64 for HermitCore
 # Note: Has to be set *before* ASM_NASM is enabled
diff --git a/cmake/README.md b/cmake/README.md
index 361a24f9c..44cb2e555 100644
--- a/cmake/README.md
+++ b/cmake/README.md
@@ -31,7 +31,7 @@ cmake/
 ├── HermitCore-Application.cmake
 ├── HermitCore.cmake
 ├── HermitCore-Paths.cmake
-├── HermitCore-Toolchain-x86.cmake
+├── HermitCore-Toolchain-x86_64.cmake
 ├── HermitCore-Utils.cmake
 ├── local-cmake.sh
 └── README.md
diff --git a/tools/proxy.c b/tools/proxy.c
index 0ff059596..408ebd846 100644
--- a/tools/proxy.c
+++ b/tools/proxy.c
@@ -74,7 +74,7 @@ typedef enum {
 
 bool verbose = false;
 
-static monitor_t monitor = BAREMETAL;
+static monitor_t monitor = UHYVE;
 static int sobufsize = 131072;
 static unsigned int isle_nr = 0;
 static unsigned int port = HERMIT_PORT;