diff --git a/lang/elisp/ChangeLog b/lang/elisp/ChangeLog
index 0fc9d19f4..61d281900 100644
--- a/lang/elisp/ChangeLog
+++ b/lang/elisp/ChangeLog
@@ -1,3 +1,9 @@
+2002-12-28  Neil Jerram  <neil@ossau.uklinux.net>
+
+	* base.scm (lang): Use char-table module.
+
+	* primitives/char-table.scm (lang): New (stub definitions).
+
 2002-12-08  Rob Browning  <rlb@defaultvalue.org>
 
 	* Makefile.am (subpkgdatadir): VERSION -> GUILE_EFFECTIVE_VERSION.
diff --git a/lang/elisp/base.scm b/lang/elisp/base.scm
index 8d145c43d..6c785cb8a 100644
--- a/lang/elisp/base.scm
+++ b/lang/elisp/base.scm
@@ -12,6 +12,7 @@
   ;; In other words, Scheme definitions of elisp primitives.  This
   ;; should (ultimately) include everything that Emacs defines in C.
   #:use-module (lang elisp primitives buffers)
+  #:use-module (lang elisp primitives char-table)
   #:use-module (lang elisp primitives features)
   #:use-module (lang elisp primitives format)
   #:use-module (lang elisp primitives fns)
diff --git a/lang/elisp/primitives/char-table.scm b/lang/elisp/primitives/char-table.scm
new file mode 100644
index 000000000..3812e4484
--- /dev/null
+++ b/lang/elisp/primitives/char-table.scm
@@ -0,0 +1,24 @@
+(define-module (lang elisp primitives char-table)
+  #:use-module (lang elisp internals fset)
+  #:use-module (lang elisp internals null)
+  #:use-module (ice-9 optargs))
+
+(fset 'make-char-table
+      (lambda* (purpose #:optional init)
+	"Return a newly created char-table, with purpose PURPOSE.
+Each element is initialized to INIT, which defaults to nil.
+PURPOSE should be a symbol which has a `char-table-extra-slots' property.
+The property's value should be an integer between 0 and 10."
+	(list purpose (vector init))))
+
+(fset 'define-charset
+      (lambda (charset-id charset-symbol info-vector)
+	(list 'charset charset-id charset-symbol info-vector)))
+
+(fset 'setup-special-charsets
+      (lambda ()
+	'unimplemented))
+
+(fset 'make-char-internal
+      (lambda ()
+	'unimplemented))