diff --git a/ChangeLog b/ChangeLog
index b08110f31e..eea94f8489 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-20  Michael Smith <msmith@songbirdnest.com>
+
+	* gst/playback/gstplaybin2.c:
+	* gst/playback/gstplaysink.c:
+	  Fix a whole bunch of typos in comments and log statements. 
+
 2008-06-20  Michael Smith <msmith@songbirdnest.com>
 
 	* sys/xvimage/xvimagesink.c:
diff --git a/gst/playback/gstplaybin2.c b/gst/playback/gstplaybin2.c
index 0abd1d8408..cf4d1d4328 100644
--- a/gst/playback/gstplaybin2.c
+++ b/gst/playback/gstplaybin2.c
@@ -350,7 +350,7 @@ struct _GstPlayBin
   GstSourceGroup *curr_group;   /* pointer to the currently playing group */
   GstSourceGroup *next_group;   /* pointer to the next group */
 
-  gboolean about_to_finish;     /* the about-to-finish signal is emited */
+  gboolean about_to_finish;     /* the about-to-finish signal is emitted */
 
   /* properties */
   guint connection_speed;       /* connection speed in bits/sec (0 = unknown) */
@@ -723,7 +723,7 @@ gst_play_bin_class_init (GstPlayBinClass * klass)
    * GstPlayBin2::video-changed
    * @playbin: a #GstPlayBin2
    *
-   * This signal is emited whenever the number or order of the video
+   * This signal is emitted whenever the number or order of the video
    * streams has changed. The application will most likely want to select
    * a new video stream.
    */
@@ -736,7 +736,7 @@ gst_play_bin_class_init (GstPlayBinClass * klass)
    * GstPlayBin2::audio-changed
    * @playbin: a #GstPlayBin2
    *
-   * This signal is emited whenever the number or order of the audio
+   * This signal is emitted whenever the number or order of the audio
    * streams has changed. The application will most likely want to select
    * a new audio stream.
    */
@@ -749,7 +749,7 @@ gst_play_bin_class_init (GstPlayBinClass * klass)
    * GstPlayBin2::text-changed
    * @playbin: a #GstPlayBin2
    *
-   * This signal is emited whenever the number or order of the text
+   * This signal is emitted whenever the number or order of the text
    * streams has changed. The application will most likely want to select
    * a new text stream.
    */
@@ -1532,7 +1532,7 @@ link_failed:
   }
 }
 
-/* called when a pad is removed form the uridecodebin. We unlink the pad from
+/* called when a pad is removed from the uridecodebin. We unlink the pad from
  * the selector. This will make the selector select a new pad. */
 static void
 pad_removed_cb (GstElement * decodebin, GstPad * pad, GstSourceGroup * group)
@@ -1706,8 +1706,8 @@ drained_cb (GstElement * decodebin, GstSourceGroup * group)
 
   GST_DEBUG_OBJECT (playbin, "about to finish in group %p", group);
 
-  /* mark use as sending out the about-to-finish signal. When the app sets a URI
-   * when this signal is emited, we're marking it as next-uri */
+  /* mark us as sending out the about-to-finish signal. When the app sets a URI
+   * when this signal is emitted, we're marking it as next-uri */
   playbin->about_to_finish = TRUE;
 
   /* after this call, we should have a next group to activate or we EOS */
diff --git a/gst/playback/gstplaysink.c b/gst/playback/gstplaysink.c
index 18d052ee84..451a558d95 100644
--- a/gst/playback/gstplaysink.c
+++ b/gst/playback/gstplaysink.c
@@ -911,7 +911,7 @@ gen_audio_chain (GstPlaySink * playsink, gboolean raw, gboolean queue)
   /* check if the sink has the volume property, if it does we don't need to
    * add a volume element. */
   if (g_object_class_find_property (G_OBJECT_GET_CLASS (chain->sink), "volume")) {
-    GST_DEBUG_OBJECT (playsink, "the sink as a volume property");
+    GST_DEBUG_OBJECT (playsink, "the sink has a volume property");
     have_volume = TRUE;
     /* take ref to sink to control the volume */
     chain->volume = gst_object_ref (chain->sink);
@@ -920,12 +920,12 @@ gen_audio_chain (GstPlaySink * playsink, gboolean raw, gboolean queue)
      * use the mute property if there is a volume property. We can simulate the
      * mute with the volume otherwise. */
     if (g_object_class_find_property (G_OBJECT_GET_CLASS (chain->sink), "mute")) {
-      GST_DEBUG_OBJECT (playsink, "the sink as a mute property");
+      GST_DEBUG_OBJECT (playsink, "the sink has a mute property");
       chain->mute = gst_object_ref (chain->sink);
     }
   } else {
     /* no volume, we need to add a volume element when we can */
-    GST_DEBUG_OBJECT (playsink, "the sink as no volume property");
+    GST_DEBUG_OBJECT (playsink, "the sink has no volume property");
     have_volume = FALSE;
   }
 
@@ -1172,7 +1172,7 @@ gst_play_sink_reconfigure (GstPlaySink * playsink)
 
   /* figure out which components we need */
   if (flags & GST_PLAY_FLAG_TEXT && playsink->text_pad) {
-    /* we subtitles and we are requested to show it, we also need to show
+    /* we have subtitles and we are requested to show it, we also need to show
      * video in this case. */
     need_video = TRUE;
     need_text = TRUE;
@@ -1239,7 +1239,7 @@ gst_play_sink_reconfigure (GstPlaySink * playsink)
     gst_pad_link (playsink->textchain->srcpad, playsink->videochain->sinkpad);
     activate_chain (GST_PLAY_CHAIN (playsink->textchain), TRUE);
   } else {
-    /* we have no audio or we are requested to not play audio */
+    /* we have no subtitles/text or we are requested to not show them */
     if (playsink->textchain) {
       add_chain (GST_PLAY_CHAIN (playsink->textchain), FALSE);
       activate_chain (GST_PLAY_CHAIN (playsink->textchain), FALSE);