diff --git a/known-bugs.txt b/known-bugs.txt
index 2e40edcc26..433c51658b 100644
--- a/known-bugs.txt
+++ b/known-bugs.txt
@@ -131,6 +131,7 @@ Duplicate (station) names after renaming [FS#3204]
 	to the automatically generated names.
 
 Extreme CPU usage/hangs when using SDL and PulseAudio [FS#3294]
+OpenTTD hangs/freezes when closing, OpenTTD is slow, OpenTTD uses a lot of CPU
 	OpenTTD can be extremely slow/use a lot of CPU when the sound is
 	played via SDL and then through PulseAudio's ALSA wrapper. Under the
 	same configuration OpenTTD, or rather SDL, might hang when exiting
diff --git a/readme.txt b/readme.txt
index 52e2355656..e55177fae8 100644
--- a/readme.txt
+++ b/readme.txt
@@ -202,10 +202,11 @@ when using other versions of the game.
 
 4.1.1) Free graphics and sound files
 ------ -----------------------------
-The free data files, split into OpenGFX for graphics and OpenSFX for sounds
-can be found at:
+The free data files, split into OpenGFX for graphics, OpenSFX for sounds and
+OpenMSX for music can be found at:
  - http://bundles.openttdcoop.org/opengfx/releases/ for OpenGFX
  - http://bundles.openttdcoop.org/opensfx/releases/ for OpenSFX
+ - http://bundles.openttdcoop.org/openmsx/releases/ for OpenMSX
 Please follow the readme of these packages about the installation procedure.
 The Windows installer can optionally download and install these packages.
 
@@ -508,8 +509,12 @@ debugging messages. This is mostly undocumented so best is to look in the
 source code file debug.c for the various debugging types. For more information
 look at http://wiki.openttd.org/index.php/Command_line.
 
-The most frequent problem is missing data files. Don't forget to put all GRF
-files from TTD into your data/ folder including sample.cat!
+The most frequent problem is missing data files. Please install OpenGFX and
+possibly OpenSFX and OpenMSX. See section 4.1.1 for more information.
+
+Under, especially, Ubuntu OpenTTD can be extremely slow and freeze/hand under
+certain circumstance. See known-bugs.txt for more information and how to
+solve this problem on your computer.
 
 Under Windows 98 and lower it is impossible to use a dedicated server; it will
 fail to start. Perhaps this is for the better because those OSes are not known