diff --git a/hermit/arch/x86/kernel/apic.c b/hermit/arch/x86/kernel/apic.c
index fa6d77c87..9e583235c 100644
--- a/hermit/arch/x86/kernel/apic.c
+++ b/hermit/arch/x86/kernel/apic.c
@@ -50,7 +50,7 @@ extern const void kernel_start;
 
 #define IOAPIC_ADDR	((size_t) &kernel_start - 2*PAGE_SIZE)
 #define LAPIC_ADDR	((size_t) &kernel_start - 1*PAGE_SIZE)
-#define MAX_APIC_CORES	128
+#define MAX_APIC_CORES	MAX_CORES
 
 // IO APIC MMIO structure: write reg, then read or write data.
 typedef struct {
diff --git a/hermit/include/hermit/config.h b/hermit/include/hermit/config.h
index 52371672a..09a589b06 100644
--- a/hermit/include/hermit/config.h
+++ b/hermit/include/hermit/config.h
@@ -32,7 +32,7 @@
 extern "C" {
 #endif
 
-#define MAX_CORES		64
+#define MAX_CORES		128
 #define MAX_TASKS		(MAX_CORES*2+2)
 #define MAX_ISLE		8
 #define MAX_FNAME		128