diff --git a/g10/ChangeLog b/g10/ChangeLog
index 2e106ed9c..c281c590b 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-03  Stefan Bellon  <sbellon@sbellon.de>
+
+	* compress.c [__riscos__]: Only use RISC OS' own ZLib module if
+	configured to use it.
+
 2003-12-30  David Shaw  <dshaw@jabberwocky.com>
 
 	* options.h, g10.c (main), import.c (parse_import_options,
diff --git a/g10/compress.c b/g10/compress.c
index 3a027e57c..88eacf8de 100644
--- a/g10/compress.c
+++ b/g10/compress.c
@@ -33,7 +33,7 @@
 #include <assert.h>
 #include <errno.h>
 #include <zlib.h>
-#ifdef __riscos__
+#if defined(__riscos__) && defined(USE_ZLIBRISCOS)
 # include "zlib-riscos.h"
 #endif
 
@@ -53,7 +53,7 @@ init_compress( compress_filter_context_t *zfx, z_stream *zs )
     int rc;
     int level;
 
-#ifdef __riscos__
+#if defined(__riscos__) && defined(USE_ZLIBRISCOS)
     static int zlib_initialized = 0;
 
     if (!zlib_initialized)