diff --git a/Makefile b/Makefile
index 39c06644c0..ef5a1b8314 100644
--- a/Makefile
+++ b/Makefile
@@ -310,7 +310,7 @@ ifdef OSX
 BASECFLAGS += -O3 -funroll-loops -fsched-interblock -falign-loops=16 -falign-jumps=16 -falign-functions=16 -falign-jumps-max-skip=15 -falign-loops-max-skip=15 -mdynamic-no-pic -mpowerpc-gpopt -force_cpusubtype_ALL $(WARNING_DISPLAY)
 else
 ifdef MORPHOS
-BASECFLAGS += -O2 -funroll-loops -fexpensive-optimizations -mstring -mmultiple $(WARNING_DISPLAY)
+BASECFLAGS += -O3 -funroll-loops -fexpensive-optimizations -mstring -mmultiple $(WARNING_DISPLAY)
 else
 BASECFLAGS += -O2 $(WARNING_DISPLAY)
 endif
diff --git a/intro_gui.c b/intro_gui.c
index 77af0fd8cb..83692e7f24 100644
--- a/intro_gui.c
+++ b/intro_gui.c
@@ -198,6 +198,8 @@ static void AskAbandonGameWndProc(Window *w, WindowEvent *e) {
 		SetDParam(0, STR_OSNAME_BEOS);
 #elif defined(__MORPHOS__)
 		SetDParam(0, STR_OSNAME_MORPHOS);
+#elif defined(__AMIGA__) /* note: __AMIGA__ is defined under MorphOS too, so it must be after __MORPHOS__. */ 
+		SET_DPARAM16(0, STR_OSNAME_AMIGAOS);
 #else
 		SetDParam(0, STR_0134_UNIX);
 #endif
diff --git a/lang/english.txt b/lang/english.txt
index 06e94ce510..ab06f7f4c1 100644
--- a/lang/english.txt
+++ b/lang/english.txt
@@ -310,6 +310,7 @@ STR_0134_UNIX							:Unix
 STR_0135_OSX							:OS X
 STR_OSNAME_BEOS							:BeOS
 STR_OSNAME_MORPHOS					:MorphOS
+STR_OSNAME_AMIGAOS                                             :AmigaOS
 
 STR_0139_IMPERIAL_MILES					:Imperial (miles)
 STR_013A_METRIC_KILOMETERS				:Metric (kilometers)
diff --git a/stdafx.h b/stdafx.h
index 23b647958f..15a59c7a0e 100644
--- a/stdafx.h
+++ b/stdafx.h
@@ -182,4 +182,9 @@ assert_compile(sizeof(uint8)	== 1);
 #define CloseConnection OTTD_CloseConnection
 #endif
 
+#if !(defined(__AMIGA__) && !defined(__MORPHOS__))
+// it seems AmigaOS already have a Point declared
+#define Point OTTD_AMIGA_POINT
+#endif
+
 #endif // !defined(_STDAFX_H)
diff --git a/unix.c b/unix.c
index c8b300a4c1..46fdfbcb71 100644
--- a/unix.c
+++ b/unix.c
@@ -351,8 +351,8 @@ const DriverDesc _sound_driver_descs[] = {
 
 const DriverDesc _music_driver_descs[] = {
 #ifndef __BEOS__
-#ifndef __MORPHOS__
-// MorphOS have no music support
+#if !defined(__MORPHOS__) && !defined(__AMIGA__)
+// MorphOS and AmigaOS have no music support
 	{"extmidi",	"External MIDI Driver",	&_extmidi_music_driver,	EXTMIDI_PRI},
 #endif
 #endif