diff --git a/ChangeLog b/ChangeLog
index c8b3ee515b..de81550548 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-05-15  Tim-Philipp Müller  <tim at centricular dot net>
+
+	Patch by: Young-Ho Cha <ganadist at chollian net>
+
+	* gst/subparse/samiparse.c: (handle_start_font):
+	  Need to map "silver" colour explicitly (#169936).
+
 2006-05-15  Tim-Philipp Müller  <tim at centricular dot net>
 
 	Patch by: Young-Ho Cha  <ganadist at chollian net>
diff --git a/gst/subparse/samiparse.c b/gst/subparse/samiparse.c
index 4068a2713f..f805df9f4a 100644
--- a/gst/subparse/samiparse.c
+++ b/gst/subparse/samiparse.c
@@ -173,6 +173,11 @@ handle_start_font (GstSamiContext * sctx, const xmlChar ** atts)
             sharp = "#";
           }
         }
+        /* silver colour can be found in many sami files, but X RGB database
+         * doesn't contain a colour by this name, so map explicitly */
+        if (!xmlStrncmp ((const xmlChar *) "silver", value, 6)) {
+          value = (const xmlChar *) "#c0c0c0";
+        }
         g_string_append_printf (sctx->buf, "<span foreground=\"%s%s\">", sharp,
             value);
         sami_context_push_state (sctx, COLOR_TAG);