diff --git a/ChangeLog b/ChangeLog
index 4212d1cf5..e6d0b7f3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-05-27  Moritz Bunkus  <moritz@bunkus.org>
 
+	* mmg: enhancement: The "mkvmerge executable" input in the
+	preferences dialog is not read-only anymore. Final part of a fix
+	for bug 490.
+
 	* mmg: bug fix: mmg will output a warning if it is used with a
 	mkvmerge executable whose version differs from mmg's version. Part
 	of a fix for bug 490.
diff --git a/src/mmg/options/mkvmerge.cpp b/src/mmg/options/mkvmerge.cpp
index 8db55ca90..11a98bc81 100644
--- a/src/mmg/options/mkvmerge.cpp
+++ b/src/mmg/options/mkvmerge.cpp
@@ -55,7 +55,7 @@ optdlg_mkvmerge_tab::optdlg_mkvmerge_tab(wxWindow *parent,
   // Create the controls.
 
   wxStaticText *st_mkvmerge = new wxStaticText(this, -1, Z("mkvmerge executable"));
-  tc_mkvmerge               = new wxTextCtrl(this, ID_TC_MKVMERGE, m_options.mkvmerge, wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
+  tc_mkvmerge               = new wxTextCtrl(this, ID_TC_MKVMERGE, m_options.mkvmerge);
   wxButton *b_browse        = new wxButton(this, ID_B_BROWSEMKVMERGE, Z("Browse"));
 
   wxStaticText *st_priority = new wxStaticText(this, -1, Z("Process priority:"));