diff --git a/hermit/include/hermit/config.h b/hermit/include/hermit/config.h
index e1e2f82ba..d24da5910 100644
--- a/hermit/include/hermit/config.h
+++ b/hermit/include/hermit/config.h
@@ -32,7 +32,7 @@
 extern "C" {
 #endif
 
-#define MAX_CORES		8
+#define MAX_CORES		40
 #define MAX_TASKS		16
 #define MAX_FNAME		128
 #define TIMER_FREQ		100 /* in HZ */
@@ -48,6 +48,7 @@ extern "C" {
 
 #define BYTE_ORDER		LITTLE_ENDIAN
 
+//#define CONFIG_TICKLESS
 //#define CONFIG_VGA
 
 #define BUILTIN_EXPECT(exp, b) 	__builtin_expect((exp), (b))
diff --git a/hermit/link.ld b/hermit/link.ld
index 85d8c7d16..c7e36d8e8 100644
--- a/hermit/link.ld
+++ b/hermit/link.ld
@@ -2,7 +2,7 @@ OUTPUT_FORMAT("elf64-x86-64")
 OUTPUT_ARCH("i386:x86-64")
 ENTRY(start)
 phys = (2 << 20);
-cores = 8;
+cores = 40;
 
 SECTIONS
 {