Index: uspace/lib/c/arch/amd64/src/entry.s
===================================================================
--- uspace/lib/c/arch/amd64/src/entry.s	(revision f4057f59dc2ae6d05e70003152cce8b9adde9242)
+++ uspace/lib/c/arch/amd64/src/entry.s	(revision 649efcd10c85afaeb282dd04ea32710ea1e24a4e)
@@ -42,5 +42,5 @@
 	#
 	pushq $0
-	movq %rsp, %rbp
+	mov %rsp, %rbp
 	
 	# %rdi was deliberately chosen as the first argument is also in %rdi
Index: uspace/lib/c/arch/amd64/src/fibril.S
===================================================================
--- uspace/lib/c/arch/amd64/src/fibril.S	(revision f4057f59dc2ae6d05e70003152cce8b9adde9242)
+++ uspace/lib/c/arch/amd64/src/fibril.S	(revision 649efcd10c85afaeb282dd04ea32710ea1e24a4e)
@@ -49,6 +49,6 @@
 	movq %rax, OFFSET_TLS(%rdi)
 		
-	xorl %eax, %eax		# context_save returns 1
-	incl %eax
+	xorq %rax,%rax		# context_save returns 1
+	incq %rax
 	ret
 
@@ -67,7 +67,7 @@
 	# Set thread local storage
 	movq OFFSET_TLS(%rdi), %rdi   # Set arg1 to TLS addr
-	movl $1, %eax		# SYS_TLS_SET
+	movq $1, %rax		# SYS_TLS_SET
 	syscall
 
-	xorl %eax, %eax		# context_restore returns 0
+	xorq %rax,%rax		# context_restore returns 0
 	ret