Index: uspace/lib/c/arch/amd64/src/entry.s
===================================================================
--- uspace/lib/c/arch/amd64/src/entry.s	(revision e4c8e7517a904e945321629fba4185c25e20de29)
+++ uspace/lib/c/arch/amd64/src/entry.s	(revision 7901ac8ed5470b03fdbc7ed1cd7a6bdfc01c7dab)
@@ -42,4 +42,5 @@
 	#
 	pushq $0
+	pushq $0
 	movq %rsp, %rbp
 	
Index: uspace/lib/c/arch/amd64/src/entryjmp.s
===================================================================
--- uspace/lib/c/arch/amd64/src/entryjmp.s	(revision e4c8e7517a904e945321629fba4185c25e20de29)
+++ uspace/lib/c/arch/amd64/src/entryjmp.s	(revision 7901ac8ed5470b03fdbc7ed1cd7a6bdfc01c7dab)
@@ -36,4 +36,8 @@
 # Jump to program entry point
 entry_point_jmp:
+	# use standard amd32 prologue not to confuse anybody
+	push %rbp
+	movq %rsp, %rbp
+	
 	# pcb must be passed in %rdi, use %rdx as a scratch register
 	mov %rdi, %rdx
Index: uspace/lib/c/arch/amd64/src/thread_entry.s
===================================================================
--- uspace/lib/c/arch/amd64/src/thread_entry.s	(revision e4c8e7517a904e945321629fba4185c25e20de29)
+++ uspace/lib/c/arch/amd64/src/thread_entry.s	(revision 7901ac8ed5470b03fdbc7ed1cd7a6bdfc01c7dab)
@@ -39,4 +39,5 @@
 	#
 	pushq $0
+	pushq $0
 	movq %rsp, %rbp