diff --git a/Makefile b/Makefile
index 1beb39b963..37dde7168c 100644
--- a/Makefile
+++ b/Makefile
@@ -496,7 +496,7 @@ endif
 # MIDI setup
 ifdef OSX
 ifndef MIDI
-MIDI:=$(OSXAPP)/contents/macos/track_starter
+MIDI:=$(OSXAPP)/contents/macosx/track_starter
 endif
 ifndef SECOND_DATA_PATH
 SECOND_DATA_PATH:="$(OSXAPP)/contents/data/"
@@ -774,7 +774,7 @@ quiet_cmd_cxx_compile = '===> Compiling $<'
 
 ifdef OSX
 OSX:=OSX
-OSX_MIDI_PLAYER_FILE:=os/macos/OpenTTDMidi.class
+OSX_MIDI_PLAYER_FILE:=os/macosx/OpenTTDMidi.class
 endif
 
 
@@ -798,12 +798,12 @@ $(OSX): $(TTD)
 	$(Q)mkdir -p "$(OSXAPP)"/Contents/Data
 	$(Q)mkdir -p "$(OSXAPP)"/Contents/Lang
 	$(Q)echo "APPL????" > "$(OSXAPP)"/Contents/PkgInfo
-	$(Q)cp os/macos/openttd.icns "$(OSXAPP)"/Contents/Resources/openttd.icns
-	$(Q)os/macos/plistgen.sh "$(OSXAPP)" "$(REV)"
-	$(Q)cp os/macos/track_starter "$(OSXAPP)"/contents/macos
-	$(Q)ls os/macos | grep -q "\.class" || \
-	       javac os/macos/OpenTTDMidi.java
-	$(Q)cp os/macos/OpenTTDMidi.class "$(OSXAPP)"/contents/macos
+	$(Q)cp os/macosx/openttd.icns "$(OSXAPP)"/Contents/Resources/openttd.icns
+	$(Q)os/macosx/plistgen.sh "$(OSXAPP)" "$(REV)"
+	$(Q)cp os/macosx/track_starter "$(OSXAPP)"/contents/macos
+	$(Q)ls os/macosx | grep -q "\.class" || \
+	       javac os/macosx/OpenTTDMidi.java
+	$(Q)cp os/macosx/OpenTTDMidi.class "$(OSXAPP)"/contents/macos
 	$(Q)cp data/* "$(OSXAPP)"/Contents/data/
 	$(Q)cp lang/*.lng "$(OSXAPP)"/Contents/lang/
 	$(Q)cp $(TTD) "$(OSXAPP)"/Contents/MacOS/$(TTD)
@@ -877,7 +877,7 @@ release: all
 	$(Q)cp COPYING "OpenTTD $(RELEASE)"/docs/
 	$(Q)cp changelog.txt "OpenTTD $(RELEASE)"/docs/
 	$(Q)cp docs/README_if_game_crashed_on_OSX.txt "OpenTTD $(RELEASE)"/docs/
-	$(Q)cp os/macos/*.webloc "OpenTTD $(RELEASE)"
+	$(Q)cp os/macosx/*.webloc "OpenTTD $(RELEASE)"
 	$(Q)cp known-bugs.txt "OpenTTD $(RELEASE)"/known-bugs.txt
 	$(Q)cp scenario/* "OpenTTD $(RELEASE)"/scenario/
 	$(Q)/usr/bin/hdiutil create -ov -format UDZO -srcfolder "OpenTTD $(RELEASE)" openttd-"$(RELEASE)"-osx.dmg
@@ -894,7 +894,7 @@ nightly_build: all
 	$(Q)cp COPYING "OpenTTD_nightly_$(DATE)"/docs/
 	$(Q)cp revisionlog.txt "OpenTTD_nightly_$(DATE)"/revisionlog.txt
 	$(Q)cp docs/README_if_game_crashed_on_OSX.txt "OpenTTD_nightly_$(DATE)"/docs/
-	$(Q)cp os/macos/*.webloc "OpenTTD_nightly_$(DATE)"/
+	$(Q)cp os/macosx/*.webloc "OpenTTD_nightly_$(DATE)"/
 	$(Q)/usr/bin/hdiutil create -ov -format UDZO -srcfolder "OpenTTD_nightly_$(DATE)" openttd-nightly-"$(DATE)".dmg
 	$(Q)rm -fr "OpenTTD_nightly_$(DATE)"
 
diff --git a/misc_gui.c b/misc_gui.c
index 0860246f8a..887e26e3c4 100644
--- a/misc_gui.c
+++ b/misc_gui.c
@@ -175,7 +175,7 @@ static const char *credits[] = {
 	"Original graphics by Simon Foster",
 	"",
 	"The OpenTTD team (in alphabetical order):",
-	"  Bjarni Corfitzen (Bjarni) - MacOS port",
+	"  Bjarni Corfitzen (Bjarni) - MacOSX port, coder",
 	"  Victor Fischer (Celestar) - Programming everywhere you need him to",
 	"  Tamas Faragó (Darkvater) - Lead coder",
 	"  Dominik Scherer (dominik81) - Lead coder",
diff --git a/os/macos/Open_Transport_Tycoon_Forum.webloc b/os/macosx/Open_Transport_Tycoon_Forum.webloc
similarity index 100%
rename from os/macos/Open_Transport_Tycoon_Forum.webloc
rename to os/macosx/Open_Transport_Tycoon_Forum.webloc
diff --git a/os/macos/Open_Transport_Tycoon_Homepage.webloc b/os/macosx/Open_Transport_Tycoon_Homepage.webloc
similarity index 100%
rename from os/macos/Open_Transport_Tycoon_Homepage.webloc
rename to os/macosx/Open_Transport_Tycoon_Homepage.webloc
diff --git a/os/macos/SourceForge_OpenTTD_project_homepage.webloc b/os/macosx/SourceForge_OpenTTD_project_homepage.webloc
similarity index 100%
rename from os/macos/SourceForge_OpenTTD_project_homepage.webloc
rename to os/macosx/SourceForge_OpenTTD_project_homepage.webloc
diff --git a/os/macos/openttd.icns b/os/macosx/openttd.icns
similarity index 100%
rename from os/macos/openttd.icns
rename to os/macosx/openttd.icns
diff --git a/os/macos/openttdmidi.java b/os/macosx/openttdmidi.java
similarity index 100%
rename from os/macos/openttdmidi.java
rename to os/macosx/openttdmidi.java
diff --git a/os/macos/plistgen.sh b/os/macosx/plistgen.sh
similarity index 100%
rename from os/macos/plistgen.sh
rename to os/macosx/plistgen.sh
diff --git a/os/macos/track_starter b/os/macosx/track_starter
similarity index 100%
rename from os/macos/track_starter
rename to os/macosx/track_starter
diff --git a/readme.txt b/readme.txt
index 776a40de75..50545250c2 100644
--- a/readme.txt
+++ b/readme.txt
@@ -212,7 +212,7 @@ That's all! You should now be able to select the language in the game options.
 X.X) Credits:
 ---- --------
 The OpenTTD team (in alphabetical order):
-  Bjarni Corfitzen (Bjarni)      - MacOS port
+  Bjarni Corfitzen (Bjarni)      - MacOSX port, coder
   Victor Fischer (Celestar)      - Programming everywhere you need him to
   Tamas Faragó (Darkvater)       - Lead programmer
   Dominik Scherer (dominik81)    - Lead programmer