diff --git a/Makefile b/Makefile
index 0a7337b3fc..036a2ca78f 100644
--- a/Makefile
+++ b/Makefile
@@ -843,8 +843,12 @@ ifdef WIN32
   SRCS += sound/win32_s.c
   SRCS += video/win32_v.c
 else
-  SRCS += unix.c
-  SRCS += music/extmidi.c
+  ifdef OS2
+    SRCS += os2.c
+  else
+    SRCS += unix.c
+    SRCS += music/extmidi.c
+  endif
 endif
 
 ifdef OSX
diff --git a/docs/Readme_OS2.txt b/docs/Readme_OS2.txt
index d5641f9e45..484663e117 100644
--- a/docs/Readme_OS2.txt
+++ b/docs/Readme_OS2.txt
@@ -50,6 +50,9 @@ To enable music, start OpenTTD with the command line:
 If I hear enough responses that both music and sound work together (it might
 just be my system), I'll have the defaults changed.
 
+Please note also that the GCC version does not currently support the MCI MIDI
+system.
+
 A NOTE ABOUT DEDICATED MULTIPLAYER SERVERS
 ------------------------------------------
 
@@ -74,9 +77,17 @@ may help to set one up (although some of the links from that page are broken):
 
    http://www.mozilla.org/ports/os2/gccsetup.html
 
+Alternatively, Paul Smedley's ready-to-go GCC build environment has been known to
+successfully build the game:
+
+   http://www.smedley.info/os2ports/index.php?page=build-environment
+
 To build, you should, if your environment is set up well enough, be able to just
 type `./configure' (or `sh configure' if you're using the OS/2 shell) and `make'.
 
+You may have to manually specify `--os OS2' on the configure command line, as
+configure cannot currently detect OS/2 manually.
+
 A note on Open Watcom
 ---------------------
 
@@ -122,4 +133,4 @@ issues, see the Contacting section of readme.txt.
 
 Thanks to Paul Smedley for his help with getting OpenTTD to compile under GCC on OS/2.
 
-- Owen Rudge, 8th January 2007
+- Owen Rudge, 24th June 2007
diff --git a/driver.c b/driver.c
index f1afb5ec76..a7bdc6802e 100644
--- a/driver.c
+++ b/driver.c
@@ -58,7 +58,7 @@ static const DriverDesc _music_driver_descs[] = {
 	M("qt",      "QuickTime MIDI Driver",   &_qtime_music_driver),
 #endif
 #ifdef UNIX
-#if !defined(__MORPHOS__) && !defined(__AMIGA__)
+#if !defined(__MORPHOS__) && !defined(__AMIGA__) && !defined(__OS2__)
 	M("extmidi", "External MIDI Driver",    &_extmidi_music_driver),
 #endif
 #endif
diff --git a/os2.c b/os2.c
index 7443e68963..d2999b42fc 100644
--- a/os2.c
+++ b/os2.c
@@ -134,7 +134,7 @@ static void ChangeWorkingDirectory(char *exe)
 	}
 }
 
-void ShowInfo(const unsigned char *str)
+void ShowInfo(const char *str)
 {
 	HAB hab;
 	HMQ hmq;