diff --git a/hermit/include/hermit/rcce.h b/hermit/include/hermit/rcce.h
index 483133e80..c3742110c 100644
--- a/hermit/include/hermit/rcce.h
+++ b/hermit/include/hermit/rcce.h
@@ -37,6 +37,7 @@
 #include <hermit/islelock.h>
 
 #define RCCE_MAXNP	8
+#define RCCE_MPB_SIZE	(64*1024)
 
 typedef struct tas {
 	volatile unsigned char reg;
diff --git a/hermit/kernel/syscall.c b/hermit/kernel/syscall.c
index 58bac6709..c20245077 100644
--- a/hermit/kernel/syscall.c
+++ b/hermit/kernel/syscall.c
@@ -423,7 +423,7 @@ static int sys_rcce_init(int session_id)
 		goto out;
 	}
 
-	paddr = get_pages(2);
+	paddr = get_pages(RCCE_MPB_SIZE / PAGE_SIZE);
 	if (BUILTIN_EXPECT(!paddr, 0))
 	{
 		err = -ENOMEM;
@@ -468,11 +468,11 @@ static size_t sys_rcce_malloc(int session_id, int ue)
 	if (i >= MAX_RCCE_SESSIONS)
 		goto out;
 
-	vaddr = vma_alloc(2*PAGE_SIZE, VMA_READ|VMA_WRITE|VMA_USER|VMA_CACHEABLE);
+	vaddr = vma_alloc(RCCE_MPB_SIZE, VMA_READ|VMA_WRITE|VMA_USER|VMA_CACHEABLE);
         if (BUILTIN_EXPECT(!vaddr, 0))
 		goto out;
 
-	if (page_map(vaddr, rcce_mpb[i].mpb[ue], 2, PG_RW|PG_USER|PG_PRESENT)) {
+	if (page_map(vaddr, rcce_mpb[i].mpb[ue], RCCE_MPB_SIZE / PAGE_SIZE, PG_RW|PG_USER|PG_PRESENT)) {
 		vma_free(vaddr, vaddr + 2*PAGE_SIZE);
 		goto out;
 	}
@@ -511,7 +511,7 @@ static int sys_rcce_fini(int session_id)
 	}
 
 	if (rcce_mpb[i].mpb[isle])
-		put_pages(rcce_mpb[i].mpb[isle], 2);
+		put_pages(rcce_mpb[i].mpb[isle], RCCE_MPB_SIZE / PAGE_SIZE);
 	rcce_mpb[i].mpb[isle] = 0;
 
 	for(j=0; (j<MAX_ISLE) && !rcce_mpb[i].mpb[j]; j++)
diff --git a/hermit/usr/ircce/RCCE.h b/hermit/usr/ircce/RCCE.h
index 1a24a644b..af6ae4b48 100644
--- a/hermit/usr/ircce/RCCE.h
+++ b/hermit/usr/ircce/RCCE.h
@@ -63,7 +63,11 @@
 #endif
 #define RCCE_LINE_SIZE                     (1<<LOG2_LINE_SIZE)
 // RCCE_BUFF_SIZE_MAX is space per UE, which is half of the space per tile 
+#ifdef __hermit__
+#define RCCE_BUFF_SIZE_MAX                 (64*1024)
+#else
 #define RCCE_BUFF_SIZE_MAX                 (1<<13)
+#endif
 
 #ifdef SHMADD
 //64MB