diff --git a/devel/ffcall/patches/patch-avcall_avcall-sparc64_S b/devel/ffcall/patches/patch-avcall_avcall-sparc64_S
index 61862261dd0..4372aa3d9ad 100644
--- a/devel/ffcall/patches/patch-avcall_avcall-sparc64_S
+++ b/devel/ffcall/patches/patch-avcall_avcall-sparc64_S
@@ -1,7 +1,15 @@
-$OpenBSD: patch-avcall_avcall-sparc64_S,v 1.1 2003/07/02 21:28:07 pvalchev Exp $
---- avcall/avcall-sparc64.S.orig	Fri Nov 26 13:28:33 1999
-+++ avcall/avcall-sparc64.S	Wed Jul  2 15:08:35 2003
-@@ -24,98 +24,98 @@ __builtin_avcall:
+$OpenBSD: patch-avcall_avcall-sparc64_S,v 1.2 2004/01/15 07:43:01 pvalchev Exp $
+--- avcall/avcall-sparc64.S.orig	1999-11-26 13:28:33.000000000 -0700
++++ avcall/avcall-sparc64.S	2004-01-15 00:25:33.000000000 -0700
+@@ -3,6 +3,7 @@
+ 	.version	"01.01"
+ .section	".text"
+ 	.align 4
++	.register %g3, #scratch
+ 	.global __builtin_avcall
+ 	DECLARE_FUNCTION(__builtin_avcall)
+ 	.type	 __builtin_avcall,$function
+@@ -24,98 +25,98 @@ __builtin_avcall:
  	cmp	%g3, 0
  	be,pn	%icc, .LL161
  	and	%o7, 2, %g3
@@ -116,7 +124,7 @@ $OpenBSD: patch-avcall_avcall-sparc64_S,v 1.1 2003/07/02 21:28:07 pvalchev Exp $
  .LL3:
  	ld	[%i0+64], %g3
  .LL176:
-@@ -126,97 +126,97 @@ __builtin_avcall:
+@@ -126,97 +127,97 @@ __builtin_avcall:
  	cmp	%g3, 0
  	be,pn	%icc, .LL177
  	and	%o7, 2, %g3
diff --git a/devel/ffcall/patches/patch-callback_vacall_r_vacall-sparc64_s b/devel/ffcall/patches/patch-callback_vacall_r_vacall-sparc64_s
new file mode 100644
index 00000000000..21421bdaa40
--- /dev/null
+++ b/devel/ffcall/patches/patch-callback_vacall_r_vacall-sparc64_s
@@ -0,0 +1,12 @@
+$OpenBSD: patch-callback_vacall_r_vacall-sparc64_s,v 1.1 2004/01/15 07:43:01 pvalchev Exp $
+--- callback/vacall_r/vacall-sparc64.s.orig	2004-01-15 00:27:46.000000000 -0700
++++ callback/vacall_r/vacall-sparc64.s	2004-01-15 00:28:03.000000000 -0700
+@@ -3,6 +3,8 @@
+ .section ".text"
+         .align 4
+         .global __vacall_r
++	.register %g2, #scratch
++	.register %g3, #scratch
+         .type __vacall_r,@function
+         .type __vacall_r,#function
+         .proc 020
diff --git a/devel/ffcall/patches/patch-vacall_vacall-sparc64_s b/devel/ffcall/patches/patch-vacall_vacall-sparc64_s
new file mode 100644
index 00000000000..bb9a72a21f8
--- /dev/null
+++ b/devel/ffcall/patches/patch-vacall_vacall-sparc64_s
@@ -0,0 +1,12 @@
+$OpenBSD: patch-vacall_vacall-sparc64_s,v 1.1 2004/01/15 07:43:01 pvalchev Exp $
+--- vacall/vacall-sparc64.s.orig	2004-01-15 00:26:27.000000000 -0700
++++ vacall/vacall-sparc64.s	2004-01-15 00:26:46.000000000 -0700
+@@ -3,6 +3,8 @@
+ .section ".text"
+         .align 4
+         .global vacall
++	.register %g2, #scratch
++	.register %g3, #scratch
+         .type vacall,@function
+         .type vacall,#function
+         .proc 020