diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index becbd703d..8f9cda318 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,11 @@
+2003-06-25  Stefan Jahn  <stefan@lkcc.org>
+
+	* continuations.c: Redeclaration of getcontext() via the
+	__asm__ ("getcontext") directive.
+
+	* continuations.h: Include <ucontext.h> instead of 
+	<sys/ucontext.h>.
+
 2003-06-21  Kevin Ryde  <user42@zip.com.au>
 
 	* numbers.c (_GNU_SOURCE): #define, to get C99 things.
diff --git a/libguile/continuations.c b/libguile/continuations.c
index a57a271e7..672a035eb 100644
--- a/libguile/continuations.c
+++ b/libguile/continuations.c
@@ -97,8 +97,7 @@ struct rv
   long retval;
   long first_return;
 };
-extern struct rv getcontext (ucontext_t *);
-extern int setcontext (ucontext_t *);
+extern struct rv ia64_getcontext (ucontext_t *) __asm__ ("getcontext");
 #endif /* __ia64__ */
 
 /* this may return more than once: the first time with the escape
@@ -138,7 +137,7 @@ scm_make_continuation (int *first)
   memcpy (continuation->stack, src, sizeof (SCM_STACKITEM) * stack_size);
 
 #ifdef __ia64__
-  rv = getcontext (&continuation->ctx);
+  rv = ia64_getcontext (&continuation->ctx);
   if (rv.first_return)
     {
       continuation->backing_store_size = 
diff --git a/libguile/continuations.h b/libguile/continuations.h
index 002a28541..6f0982033 100644
--- a/libguile/continuations.h
+++ b/libguile/continuations.h
@@ -26,7 +26,7 @@
 
 #ifdef __ia64__
 #include <signal.h>
-#include <sys/ucontext.h>
+#include <ucontext.h>
 extern unsigned long * __libc_ia64_register_backing_store_base;
 #endif /* __ia64__ */