diff --git a/servers/vm/mmap.c b/servers/vm/mmap.c
index e458fc5cc..2659b6e45 100644
--- a/servers/vm/mmap.c
+++ b/servers/vm/mmap.c
@@ -294,6 +294,8 @@ PUBLIC int do_shared_unmap(message *m)
 	vir_bytes addr;
 
 	target = m->VMUN_ENDPT;
+	if (target == SELF)
+		target = m->m_source;
 
 	if ((r = vm_isokendpt(target, &n)) != OK)
 		return EINVAL;