diff --git a/tools/ChangeLog b/tools/ChangeLog
index 73cc5653b..39665526a 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,3 +1,10 @@
+2002-01-02  Stefan Bellon  <sbellon@sbellon.de>
+
+	* gpgsplit.c [__riscos__]: Added RISC OS specific file name
+	code.
+
+	* gpgsplit.c (write_part): Introduced two explicit casts.
+
 2001-12-21  David Shaw  <dshaw@jabberwocky.com>
 
 	* gpgsplit.c (pkttype_to_string): PKT_PHOTO_ID -> PKT_ATTRIBUTE
diff --git a/tools/gpgsplit.c b/tools/gpgsplit.c
index e7283a412..17c4a0aa1 100644
--- a/tools/gpgsplit.c
+++ b/tools/gpgsplit.c
@@ -34,7 +34,11 @@
   #include <fcntl.h> /* for setmode() */
 #endif
 #include <zlib.h>
+#ifdef __riscos__
+#include <unixlib/local.h>
+#endif /* __riscos__ */
 
+#define INCLUDED_BY_MAIN_MODULE 1
 #include "../g10/packet.h"
 #include "util.h"
 
@@ -96,6 +100,10 @@ main( int argc, char **argv )
 {
     ARGPARSE_ARGS pargs;
 
+  #ifdef __riscos__
+    /* set global RISC OS specific properties */
+    __riscosify_control = __RISCOSIFY_NO_PROCESS;
+  #endif /* __riscos__ */
   #ifdef HAVE_DOSISH_SYSTEM
     setmode( fileno(stdin), O_BINARY );
     setmode( fileno(stdout), O_BINARY );
@@ -344,7 +352,7 @@ write_part ( const char *fname, FILE *fpin, unsigned long pktlen,
                     if (zs.avail_in < inbufsize) {
                         n = zs.avail_in;
                         if (!n)
-                            zs.next_in = inbuf;
+                            zs.next_in = (Bytef *) inbuf;
                         count = inbufsize - n;
                         for (nread=0;
                              nread < count && (c=getc (fpin)) != EOF;
@@ -358,7 +366,7 @@ write_part ( const char *fname, FILE *fpin, unsigned long pktlen,
                         }
                         zs.avail_in = n;
                     }
-                    zs.next_out = outbuf;
+                    zs.next_out = (Bytef *) outbuf;
                     zs.avail_out = outbufsize;
                     
                     if (!zinit_done) {