diff --git a/Filelist b/Filelist
index 046be1a..37822bc 100644
--- a/Filelist
+++ b/Filelist
@@ -427,7 +427,6 @@
 		$(SRC_VMS) \
 		README_os390.txt \
 		src/Make_mint.mak \
-		src/Make_ro.mak \
 		src/if_sniff.c \
 		src/infplist.xml \
 		src/link.390 \
diff --git a/README_extra.txt b/README_extra.txt
index 68eebef..2bbc056 100644
--- a/README_extra.txt
+++ b/README_extra.txt
@@ -13,9 +13,6 @@
 
 src/os_amiga.*		Files for the Amiga port.
 
-src/gui_riscos.*
-src/os_riscos.*		Files for the RISC OS port.
-
 src/gui_beos.*
 src/os_beos.*		Files for the BeOS port.
 
diff --git a/src/INSTALL b/src/INSTALL
index dd50e0d..aa4b6e3 100644
--- a/src/INSTALL
+++ b/src/INSTALL
@@ -6,9 +6,8 @@
 Contents:
 1. Generic
 2. Unix
-3. RISC OS
-4. OS/2 (with EMX 0.9b)
-5. Atari MiNT
+3. OS/2 (with EMX 0.9b)
+4. Atari MiNT
 
 See INSTALLami.txt              for Amiga
 See INSTALLmac.txt              for Macintosh
@@ -174,25 +173,7 @@
 	./configure --without-local-dir
 
 
-3. RISC OS
-=============
-
-Much file renaming is needed before you can compile anything.
-You'll need UnixLib to link against, GCC and GNU make.
-
-I suggest you get the RISC OS binary distribution, which includes the
-Templates file and the loader.
-
-Try here: http://www.ecs.soton.ac.uk/~tal197
-
-Do
-    :help riscos
-
-within the editor for more information, or read the
-../runtime/doc/os_risc.txt help file.
-
-
-4. OS/2
+3. OS/2
 =======
 
 Summary:
@@ -237,7 +218,7 @@
 Check ../runtime/doc/os_os2.txt for additional info on running Vim.
 
 
-5. Atari MiNT
+4. Atari MiNT
 =============
 
 [NOTE: this is quite old, it might not work anymore]
diff --git a/src/Make_ro.mak b/src/Make_ro.mak
deleted file mode 100644
index 203a18a..0000000
--- a/src/Make_ro.mak
+++ /dev/null
@@ -1,135 +0,0 @@
-#
-# Makefile for Vim on RISC OS - Andy Wingate
-#
-
-GCC         = gcc -mthrowback
-CFLAGS     = -DRISCOS -DFEAT_GUI
-CC         = $(GCC) $(CFLAGS) -O2
-# -DUP_BC_PC_EXTERN for term.c needed as BC defined in termlib.c and term.c
-
-TERMFLAG   = -DUP_BC_PC_EXTERN
-
-ASMFLAGS   = -throwback -objasm -gcc
-
-OBJS =  o.buffer o.charset o.diff o.digraph o.edit o.eval o.ex_cmds o.ex_cmds2  \
-	o.ex_docmd o.ex_eval o.ex_getln o.fileio o.fold o.getchar \
-	o.hardcopy o.hashtab o.main o.mark o.mbyte  \
-	o.memfile o.memline o.menu o.message o.misc1 o.misc2 o.move     \
-	o.normal o.ops o.option o.popupmnu o.quickfix o.regexp o.screen \
-	o.search   \
-	o.spell o.syntax o.tag o.term o.termlib o.ui o.undo o.version	\
-	o.window o.os_riscos o.swis o.gui o.gui_riscos
-
-Vim: $(OBJS)
-	$(GCC) -o Vim $(OBJS)
-
-install: Vim
-	squeeze -v Vim @.!Vim.Vim
-
-clean:	
-	create o.!fake! 0
-	wipe o.* ~cf
-	remove Vim
-
-o.swis: s.swis
-	as $(ASMFLAGS) -o o.swis s.swis
-
-# Rules for object files
-
-o.%:	c.%
-	$(CC) -c $< -o $@
-
-o.buffer:	c.buffer
-
-o.charset:	c.charset
-
-o.digraph:	c.digraph
-
-o.diff:		c.diff
-
-o.edit:		c.edit
-
-o.eval:		c.eval
-
-o.ex_cmds:	c.ex_cmds
-
-o.ex_cmds2:	c.ex_cmds2
-
-o.ex_docmd:	c.ex_docmd
-
-o.ex_eval:	c.ex_eval
-
-o.ex_getln:	c.ex_getln
-
-o.fileio:	c.fileio
-
-o.fold:		c.fold
-
-o.getchar:	c.getchar
-
-o.hardcopy:	c.hardcopy
-
-o.hashtab:	c.hashtab
-
-o.gui:		c.gui
-
-o.gui_riscos:	c.gui_riscos
-
-o.main:		c.main
-
-o.mark:		c.mark
-
-o.mbyte:	c.mbyte
-
-o.memfile:	c.memfile
-
-o.memline:	c.memline
-
-o.menu:		c.menu
-
-o.message:	c.message
-
-o.misc1:	c.misc1
-
-o.misc2:	c.misc2
-
-o.move:		c.move
-
-o.normal:	c.normal
-
-o.ops:		c.ops
-
-o.option:	c.option
-
-o.os_riscos:	c.os_riscos
-
-o.pty:		c.pty
-
-o.popupmnu:	c.popupmnu
-
-o.quickfix:	c.quickfix
-
-o.regexp:	c.regexp
-
-o.screen:	c.screen
-
-o.search:	c.search
-
-o.spell:	c.spell
-
-o.syntax:	c.syntax
-
-o.tag:		c.tag
-
-o.term:		c.term
-	$(CC) $(TERMFLAG) -c c.term -o o.term
-
-o.termlib:	c.termlib
-
-o.ui:		c.ui
-
-o.undo:		c.undo
-
-o.version:	c.version
-
-o.window:	c.window
diff --git a/src/Makefile b/src/Makefile
index 539c69f..5d5b600 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -29,7 +29,7 @@
 #	- Uncomment the line "CONF_OPT_X = --without-x" if you have X11 but
 #	  want to disable using X11 libraries.	This speeds up starting Vim,
 #	  but the window title will not be set and the X11 selection can not
-#	  used.
+#	  be used.
 #	- Uncomment the line "CONF_OPT_XSMP = --disable-xsmp" if you have the
 #	  X11 Session Management Protocol (XSMP) library (libSM) but do not
 #	  want to use it.
@@ -730,12 +730,6 @@
 ### USL for Unix Systems Laboratories (SYSV 4.2)
 #EXTRA_DEFS = -DUSL
 
-### RISCos on MIPS without X11
-#EXTRA_DEFS = -DMIPS
-
-### RISCos on MIPS with X11
-#EXTRA_LIBS = -lsun
-
 ### (6)  A/UX 3.1.1 with gcc (Jim Jagielski)
 #CC= gcc -D_POSIX_SOURCE
 #CFLAGS= -O2
@@ -1633,7 +1627,7 @@
 RSRC_DIR = os_mac_rsrc
 
 PRO_MANUAL = os_amiga.pro os_msdos.pro os_win16.pro os_win32.pro \
-	os_mswin.pro os_beos.pro os_vms.pro os_riscos.pro $(PERL_PRO)
+	os_mswin.pro os_beos.pro os_vms.pro $(PERL_PRO)
 
 # Default target is making the executable and tools
 all: $(VIMTARGET) $(TOOLS) languages $(GUI_BUNDLE)
diff --git a/src/buffer.c b/src/buffer.c
index 254331e..24cbc06 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1808,9 +1808,6 @@
 #ifdef FEAT_AUTOCMD
     clear_string_option(&buf->b_p_ft);
 #endif
-#ifdef FEAT_OSFILETYPE
-    clear_string_option(&buf->b_p_oft);
-#endif
 #ifdef FEAT_CINDENT
     clear_string_option(&buf->b_p_cink);
     clear_string_option(&buf->b_p_cino);
diff --git a/src/eval.c b/src/eval.c
index ee2af10..db7b106 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -12076,9 +12076,6 @@
 #ifdef FEAT_OLE
 	"ole",
 #endif
-#ifdef FEAT_OSFILETYPE
-	"osfiletype",
-#endif
 #ifdef FEAT_PATH_EXTRA
 	"path_extra",
 #endif
diff --git a/src/feature.h b/src/feature.h
index ea79758..2fdd901 100644
--- a/src/feature.h
+++ b/src/feature.h
@@ -506,15 +506,6 @@
 #endif
 
 /*
- * +osfiletype		filetype checking in autocommand patterns.
- *			Only on systems that support filetypes (RISC OS).
- */
-#if 0
-# define FEAT_OSFILETYPE
-# define DFLT_OFT "Text"
-#endif
-
-/*
  * +viminfo		reading/writing the viminfo file. Takes about 8Kbyte
  *			of code.
  * VIMINFO_FILE		Location of user .viminfo file (should start with $).
diff --git a/src/option.c b/src/option.c
index a545588..7184649 100644
--- a/src/option.c
+++ b/src/option.c
@@ -140,9 +140,6 @@
 #define PV_MOD		OPT_BUF(BV_MOD)
 #define PV_MPS		OPT_BUF(BV_MPS)
 #define PV_NF		OPT_BUF(BV_NF)
-#ifdef FEAT_OSFILETYPE
-# define PV_OFT		OPT_BUF(BV_OFT)
-#endif
 #ifdef FEAT_COMPL_FUNC
 # define PV_OFU		OPT_BUF(BV_OFU)
 #endif
@@ -337,9 +334,6 @@
 static int	p_mod;
 static char_u	*p_mps;
 static char_u	*p_nf;
-#ifdef FEAT_OSFILETYPE
-static char_u	*p_oft;
-#endif
 static int	p_pi;
 #ifdef FEAT_TEXTOBJ
 static char_u	*p_qe;
@@ -1901,14 +1895,8 @@
 			    (char_u *)NULL, PV_NONE,
 			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
     {"osfiletype",  "oft",  P_STRING|P_ALLOCED|P_VI_DEF,
-#ifdef FEAT_OSFILETYPE
-			    (char_u *)&p_oft, PV_OFT,
-			    {(char_u *)DFLT_OFT, (char_u *)0L}
-#else
 			    (char_u *)NULL, PV_NONE,
-			    {(char_u *)0L, (char_u *)0L}
-#endif
-			    SCRIPTID_INIT},
+			    {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
     {"paragraphs",  "para", P_STRING|P_VI_DEF,
 			    (char_u *)&p_para, PV_NONE,
 			    {(char_u *)"IPLPPPQPP TPHPLIPpLpItpplpipbp",
@@ -5282,9 +5270,6 @@
 #ifdef FEAT_AUTOCMD
     check_string_option(&buf->b_p_ft);
 #endif
-#ifdef FEAT_OSFILETYPE
-    check_string_option(&buf->b_p_oft);
-#endif
 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT)
     check_string_option(&buf->b_p_cinw);
 #endif
@@ -9665,9 +9650,6 @@
 	case PV_MA:	return (char_u *)&(curbuf->b_p_ma);
 	case PV_MOD:	return (char_u *)&(curbuf->b_changed);
 	case PV_NF:	return (char_u *)&(curbuf->b_p_nf);
-#ifdef FEAT_OSFILETYPE
-	case PV_OFT:	return (char_u *)&(curbuf->b_p_oft);
-#endif
 	case PV_PI:	return (char_u *)&(curbuf->b_p_pi);
 #ifdef FEAT_TEXTOBJ
 	case PV_QE:	return (char_u *)&(curbuf->b_p_qe);
@@ -10018,9 +10000,6 @@
 	    /* Don't copy 'filetype', it must be detected */
 	    buf->b_p_ft = empty_option;
 #endif
-#ifdef FEAT_OSFILETYPE
-	    buf->b_p_oft = vim_strsave(p_oft);
-#endif
 	    buf->b_p_pi = p_pi;
 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT)
 	    buf->b_p_cinw = vim_strsave(p_cinw);
diff --git a/src/option.h b/src/option.h
index e2e65a0..b5f7d47 100644
--- a/src/option.h
+++ b/src/option.h
@@ -984,9 +984,6 @@
     , BV_MOD
     , BV_MPS
     , BV_NF
-#ifdef FEAT_OSFILETYPE
-    , BV_OFT
-#endif
 #ifdef FEAT_COMPL_FUNC
     , BV_OFU
 #endif
diff --git a/src/pty.c b/src/pty.c
index bc28c0d..59e0069 100644
--- a/src/pty.c
+++ b/src/pty.c
@@ -123,8 +123,7 @@
 static void initmaster __ARGS((int));
 
 /*
- *  Open all ptys with O_NOCTTY, just to be on the safe side
- *  (RISCos mips breaks otherwise)
+ *  Open all ptys with O_NOCTTY, just to be on the safe side.
  */
 #ifndef O_NOCTTY
 # define O_NOCTTY 0
diff --git a/src/structs.h b/src/structs.h
index 2954035..7b71a5f 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -1530,9 +1530,6 @@
     int		b_p_ml_nobin;	/* b_p_ml saved for binary mode */
     int		b_p_ma;		/* 'modifiable' */
     char_u	*b_p_nf;	/* 'nrformats' */
-#ifdef FEAT_OSFILETYPE
-    char_u	*b_p_oft;	/* 'osfiletype' */
-#endif
     int		b_p_pi;		/* 'preserveindent' */
 #ifdef FEAT_TEXTOBJ
     char_u	*b_p_qe;	/* 'quoteescape' */
diff --git a/src/version.c b/src/version.c
index c83ba0e..a14c43d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -426,11 +426,6 @@
 	"-ole",
 # endif
 #endif
-#ifdef FEAT_OSFILETYPE
-	"+osfiletype",
-#else
-	"-osfiletype",
-#endif
 #ifdef FEAT_PATH_EXTRA
 	"+path_extra",
 #else
@@ -715,6 +710,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    191,
+/**/
     190,
 /**/
     189,