diff --git a/ice-9/ChangeLog b/ice-9/ChangeLog
index a83460eea..4d7d4d5ec 100644
--- a/ice-9/ChangeLog
+++ b/ice-9/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-10  Mikael Djurfeldt  <djurfeldt@nada.kth.se>
+
+	* Makefile.am (ice9_sources): Added occam-channel.scm.
+
+	* occam-channel.scm: New file.  Implements occam-like channels.
+
 2002-12-28  Neil Jerram  <neil@ossau.uklinux.net>
 
 	* boot-9.scm (module-defined-hook): New hook, run whenever a new
diff --git a/ice-9/Makefile.am b/ice-9/Makefile.am
index 23276154e..e1b82c5ab 100644
--- a/ice-9/Makefile.am
+++ b/ice-9/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in.
 ##
-##  	Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+##   Copyright (C) 1998,1999,2000,2001,2003 Free Software Foundation, Inc.
 ##
 ##   This file is part of GUILE.
 ##
@@ -34,7 +34,7 @@ ice9_sources =								   \
 	safe-r5rs.scm safe.scm session.scm slib.scm stack-catch.scm	   \
 	streams.scm string-fun.scm syncase.scm threads.scm	   	   \
 	buffered-input.scm time.scm history.scm channel.scm		   \
-        pretty-print.scm ftw.scm gap-buffer.scm
+        pretty-print.scm ftw.scm gap-buffer.scm occam-channel.scm
 
 subpkgdatadir = $(pkgdatadir)/${GUILE_EFFECTIVE_VERSION}/ice-9
 subpkgdata_DATA = $(ice9_sources)
diff --git a/ice-9/occam-channel.scm b/ice-9/occam-channel.scm
new file mode 100644
index 000000000..72698252e
--- /dev/null
+++ b/ice-9/occam-channel.scm
@@ -0,0 +1,90 @@
+;;;; Occam-like channels
+
+;;; Copyright (C) 2003 Free Software Foundation, Inc.
+;;;
+;;; This program is free software; you can redistribute it and/or
+;;; modify it under the terms of the GNU General Public License as
+;;; published by the Free Software Foundation; either version 2, or
+;;; (at your option) any later version.
+;;;
+;;; This program is distributed in the hope that it will be useful,
+;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;;; General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with this software; see the file COPYING.  If not, write to
+;;; the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+;;; Boston, MA 02111-1307 USA
+;;;
+;;; As a special exception, the Free Software Foundation gives permission
+;;; for additional uses of the text contained in its release of GUILE.
+;;;
+;;; The exception is that, if you link the GUILE library with other files
+;;; to produce an executable, this does not by itself cause the
+;;; resulting executable to be covered by the GNU General Public License.
+;;; Your use of that executable is in no way restricted on account of
+;;; linking the GUILE library code into it.
+;;;
+;;; This exception does not however invalidate any other reasons why
+;;; the executable file might be covered by the GNU General Public License.
+;;;
+;;; This exception applies only to the code released by the
+;;; Free Software Foundation under the name GUILE.  If you copy
+;;; code from other Free Software Foundation releases into a copy of
+;;; GUILE, as the General Public License permits, the exception does
+;;; not apply to the code that you add in this way.  To avoid misleading
+;;; anyone as to the status of such modified files, you must delete
+;;; this exception notice from them.
+;;;
+;;; If you write modifications of your own for GUILE, it is your choice
+;;; whether to permit this exception to apply to your modifications.
+;;; If you do not wish that, delete this exception notice.
+
+(define-module (ice-9 occam-channel)
+  #:use-module (oop goops)
+  #:use-module (ice-9 threads)
+  ;;#:export-syntax (alt)
+  #:export (channel ? !))
+
+(define no-data '(no-data))
+(define receiver-waiting '(receiver-waiting))
+
+(define-class <channel> ()
+  (data #:accessor data #:init-value no-data)
+  (cv #:accessor cv #:init-form (make-condition-variable))
+  (mutex #:accessor mutex #:init-form (make-mutex)))
+
+(define-method (channel)
+  (make <channel>))
+
+(define-method (? (ch <channel>))
+  (lock-mutex (mutex ch))
+  (cond ((eq? (data ch) no-data)
+	 (set! (data ch) receiver-waiting)
+	 (wait-condition-variable (cv ch) (mutex ch)))
+	((eq? (data ch) receiver-waiting)
+	 (unlock-mutex (mutex ch))
+	 (scm-error 'misc-error '? "another process is already receiving on ~A"
+		    (list ch) #f))
+	(else
+	 ;; sender is waiting
+	 (signal-condition-variable (cv ch))))
+  (let ((res (data ch)))
+    (set! (data ch) no-data)
+    (unlock-mutex (mutex ch))
+    res))
+
+(define-method (! (ch <channel>) (x <top>))
+  (lock-mutex (mutex ch))
+  (cond ((eq? (data ch) no-data)
+	 (set! (data ch) x)
+	 (wait-condition-variable (cv ch) (mutex ch)))
+	((eq? (data ch) receiver-waiting)
+	 (set! (data ch) x)
+	 (signal-condition-variable (cv ch)))
+	(else
+	 (unlock-mutex (mutex ch))
+	 (scm-error 'misc-error '! "another process is already sending on ~A"
+		    (list ch) #f)))
+  (unlock-mutex (mutex ch)))