diff --git a/reactos/lib/pseh/amd64/framebased.S b/reactos/lib/pseh/amd64/framebased.S
new file mode 100644
index 00000000000..b7d8607ce8d
--- /dev/null
+++ b/reactos/lib/pseh/amd64/framebased.S
@@ -0,0 +1,73 @@
+// Copyright (c) 2004/2005 KJK::Hyperion
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to dos so, subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+.text
+.intel_syntax noprefix
+
+.globl __SEHCleanHandlerEnvironment
+__SEHCleanHandlerEnvironment:
+	cld
+	ret
+
+.globl __SEHCurrentRegistration
+__SEHCurrentRegistration:
+	mov rax, [fs:0]
+	ret
+
+.globl __SEHRegisterFrame
+__SEHRegisterFrame:
+	mov rcx, [rsp+4]
+	mov rax, [fs:0]
+	mov [rcx+0], eax
+	mov [fs:0], ecx
+	ret
+
+.globl __SEHUnregisterFrame
+__SEHUnregisterFrame:
+	mov rcx, [fs:0]
+	mov rcx, [rcx+0]
+	mov [fs:0], rcx
+	ret
+
+.globl __SEHGlobalUnwind
+__SEHGlobalUnwind:
+
+.extern __SEHRtlUnwind
+
+// RtlUnwind clobbers all the "don't clobber" registers, so we save them
+	push rbx
+	mov rbx, [rsp+8]
+	push rsi
+	push rdi
+
+	push 0 // ReturnValue
+	push 0 // ExceptionRecord
+	push .RestoreRegisters // TargetIp
+	push rbx // TargetFrame
+	call [__SEHRtlUnwind]
+
+.RestoreRegisters:
+	pop rdi
+	pop rsi
+	pop rbx
+
+	ret
+
+// EOF
diff --git a/reactos/lib/pseh/framebased.c b/reactos/lib/pseh/framebased.c
index 121cb90d9e0..b74b174ecfc 100644
--- a/reactos/lib/pseh/framebased.c
+++ b/reactos/lib/pseh/framebased.c
@@ -94,7 +94,7 @@ extern unsigned long __cdecl DbgPrint(const char * format, ...);
 	} \
 }
 
-#ifdef _X86_
+#ifdef __i386__
 #define _SEH_TRACE_CONTEXT(FRAME_, CONTEXT_) \
 { \
 	if((FRAME_)->SPF_Tracing & _SEH_DO_TRACE_CONTEXT) \
diff --git a/reactos/lib/pseh/pseh.rbuild b/reactos/lib/pseh/pseh.rbuild
index 39ddc903861..d1173209df5 100644
--- a/reactos/lib/pseh/pseh.rbuild
+++ b/reactos/lib/pseh/pseh.rbuild
@@ -11,5 +11,10 @@
 			<file>framebased.S</file>
 		</directory>
 	</if>
+	<if property="ARCH" value="amd64">
+		<directory name="amd64">
+			<file>framebased.S</file>
+		</directory>
+	</if>
 	<file>framebased.c</file>
 </module>