diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
index 1e41e4d9bc0..1eb53d7d36e 100644
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -1370,7 +1370,6 @@
 # or 'wine_' (for user-visible functions) to avoid namespace conflicts.
 
 # Relays
-@ cdecl -norelay -i386 __wine_call_from_32_regs()
 @ cdecl -i386 __wine_enter_vm86(ptr)
 
 # Server interface
diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c
index 4ec0dbfb2f3..a1c7970520f 100644
--- a/tools/winebuild/relay.c
+++ b/tools/winebuild/relay.c
@@ -975,6 +975,12 @@ void BuildRelays16(void)
     output( "%s\n\t.long 0\n", asm_globl("CallTo16_DataSelector") );
     output( "%s\n\t.long 0\n", asm_globl("CallTo16_TebSelector") );
     if (UsePIC) output( "wine_ldt_copy_ptr:\t.long %s\n", asm_name("wine_ldt_copy") );
+
+    output( "\t.text\n" );
+    output( "%s:\n\n", asm_name("__wine_spec_thunk_text_32") );
+    BuildCallFrom32Regs();
+    output_function_size( "__wine_spec_thunk_text_32" );
+
     output_gnu_stack_note();
 }