diff --git a/sys/arch/i386/i386/svr4_machdep.c b/sys/arch/i386/i386/svr4_machdep.c
index 721f36a5b260..3ad3f5489b2f 100644
--- a/sys/arch/i386/i386/svr4_machdep.c
+++ b/sys/arch/i386/i386/svr4_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_machdep.c,v 1.10 1995/06/24 20:36:30 christos Exp $	 */
+/*	$NetBSD: svr4_machdep.c,v 1.11 1995/08/14 01:17:02 mycroft Exp $	 */
 
 /*
  * Copyright (c) 1994 Christos Zoulas
@@ -64,8 +64,8 @@ svr4_getcontext(p, uc, mask, oonstack)
 {
 	struct trapframe *tf = p->p_md.md_regs;
 	struct sigacts *psp = p->p_sigacts;
-	svr4_greg_t* r = uc->uc_mcontext.greg;
-	svr4_stack_t *s = &uc->uc_stack;
+	svr4_greg_t *r = uc->uc_mcontext.greg;
+	struct svr4_sigaltstack *s = &uc->uc_stack;
 	struct sigaltstack *sf = &psp->ps_sigstk;
 
 	bzero(uc, sizeof(struct svr4_ucontext));
@@ -138,8 +138,8 @@ svr4_setcontext(p, uc)
 	struct sigcontext *scp, context;
 	struct sigacts *psp = p->p_sigacts;
 	register struct trapframe *tf;
-	svr4_greg_t* r = uc->uc_mcontext.greg;
-	svr4_stack_t *s = &uc->uc_stack;
+	svr4_greg_t *r = uc->uc_mcontext.greg;
+	struct svr4_sigaltstack *s = &uc->uc_stack;
 	struct sigaltstack *sf = &psp->ps_sigstk;
 	int mask;
 
diff --git a/sys/arch/sparc/sparc/svr4_machdep.c b/sys/arch/sparc/sparc/svr4_machdep.c
index 4b35c8c72bb8..81ffafad55e8 100644
--- a/sys/arch/sparc/sparc/svr4_machdep.c
+++ b/sys/arch/sparc/sparc/svr4_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_machdep.c,v 1.5 1995/07/05 13:06:33 pk Exp $	 */
+/*	$NetBSD: svr4_machdep.c,v 1.6 1995/08/14 01:17:34 mycroft Exp $	 */
 
 /*
  * Copyright (c) 1994 Christos Zoulas
@@ -71,8 +71,8 @@ svr4_getcontext(p, uc, mask, oonstack)
 {
 	struct trapframe *tf = (struct trapframe *)p->p_md.md_tf;
 	struct sigacts *psp = p->p_sigacts;
-	svr4_greg_t* r = uc->uc_mcontext.greg;
-	svr4_stack_t *s = &uc->uc_stack;
+	svr4_greg_t *r = uc->uc_mcontext.greg;
+	struct svr4_sigaltstack *s = &uc->uc_stack;
 	struct sigaltstack *sf = &psp->ps_sigstk;
 
 	bzero(uc, sizeof(struct svr4_ucontext));
@@ -136,8 +136,8 @@ svr4_setcontext(p, uc)
 	struct sigcontext *scp, context;
 	struct sigacts *psp = p->p_sigacts;
 	register struct trapframe *tf;
-	svr4_greg_t* r = uc->uc_mcontext.greg;
-	svr4_stack_t *s = &uc->uc_stack;
+	svr4_greg_t *r = uc->uc_mcontext.greg;
+	struct svr4_sigaltstack *s = &uc->uc_stack;
 	struct sigaltstack *sf = &psp->ps_sigstk;
 	int mask;
 
diff --git a/sys/compat/svr4/svr4_ucontext.h b/sys/compat/svr4/svr4_ucontext.h
index 1590b933ebdc..5359acaa6852 100644
--- a/sys/compat/svr4/svr4_ucontext.h
+++ b/sys/compat/svr4/svr4_ucontext.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_ucontext.h,v 1.2 1995/03/31 03:06:49 christos Exp $	 */
+/*	$NetBSD: svr4_ucontext.h,v 1.3 1995/08/14 01:13:29 mycroft Exp $	 */
 
 /*
  * Copyright (c) 1994 Christos Zoulas
@@ -53,7 +53,7 @@ typedef struct svr4_ucontext {
 	u_long			 uc_flags;
 	struct svr4_ucontext	*uc_link;
 	svr4_sigset_t		 uc_sigmask;
-	svr4_stack_t		 uc_stack;
+	struct svr4_sigaltstack	 uc_stack;
 	svr4_mcontext_t		 uc_mcontext;
 	long			 uc_pad[5];
 } svr4_ucontext_t;