diff --git a/HISTORY b/HISTORY
index 948e353a..48c4e882 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1298,6 +1298,8 @@ Video Disk Recorder Revision History
 2002-06-10: Version 1.0.4
 
 - Added Romanian language texts (thanks to Paul Lacatus).
+- Removed compiler option '-m486' to make it work on non-Intel platforms (thanks
+  to Alastair McKinstry for pointing this out).
 
 2002-05-26: Version 1.1.3
 
@@ -1323,3 +1325,6 @@ Video Disk Recorder Revision History
 - Added Swedish language texts (thanks to Tomas Prybil).
 - Fixed parsing 'E' records in epg2html.pl (thanks to Matthias Fechner for pointing
   out this one).
+- Removed compiler option '-m486' to make it work on non-Intel platforms. If you
+  have already started a plugin project, you may want to make sure you remove this
+  option from your existing Makefile.
diff --git a/Makefile b/Makefile
index 25a4f61e..d0964ba3 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.38 2002/05/20 10:56:37 kls Exp $
+# $Id: Makefile 1.39 2002/06/10 16:26:51 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -57,7 +57,7 @@ font: genfontfile fontfix.c fontosd.c
 # Implicit rules:
 
 %.o: %.c
-	g++ -g -O2 -Wall -Woverloaded-virtual -m486 -c $(DEFINES) $(INCLUDES) $<
+	g++ -g -O2 -Wall -Woverloaded-virtual -c $(DEFINES) $(INCLUDES) $<
 
 # Dependencies:
 
diff --git a/PLUGINS/src/hello/Makefile b/PLUGINS/src/hello/Makefile
index a6dafc27..b9d911ab 100644
--- a/PLUGINS/src/hello/Makefile
+++ b/PLUGINS/src/hello/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.3 2002/05/14 21:21:32 kls Exp $
+# $Id: Makefile 1.4 2002/06/10 16:24:06 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -43,7 +43,7 @@ OBJS = $(PLUGIN).o i18n.o
 ### The C++ compiler and options:
 
 CXX      = g++
-CXXFLAGS = -O2 -Wall -Woverloaded-virtual -m486
+CXXFLAGS = -O2 -Wall -Woverloaded-virtual
 
 ### Implicit rules:
 
diff --git a/newplugin b/newplugin
index a207d034..40413902 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 1.5 2002/05/14 21:22:59 kls Exp $
+# $Id: newplugin 1.6 2002/06/10 16:24:34 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -98,7 +98,7 @@ OBJS = \$(PLUGIN).o
 ### The C++ compiler and options:
 
 CXX      = g++
-CXXFLAGS = -O2 -Wall -Woverloaded-virtual -m486
+CXXFLAGS = -O2 -Wall -Woverloaded-virtual
 
 ### Implicit rules: