diff --git a/ChangeLog b/ChangeLog
index 8254aaf6dd..85f7333f3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-13  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* ext/dvdnav/dvdnavsrc.c: (gst_dvd_nav_src_set_property):
+	  Don't forget to unlock when setting the device property, or
+	  we'll sooner or later deadlock.
+
 2007-06-12  Sebastien Moutte  <sebastien@moutte.net>
 
 	* gst/dvdsub/gstdvdsubdec.c:(gst_dvd_sub_dec_parse_subpic):
diff --git a/ext/dvdnav/dvdnavsrc.c b/ext/dvdnav/dvdnavsrc.c
index 38b52356cb..a88e195afd 100644
--- a/ext/dvdnav/dvdnavsrc.c
+++ b/ext/dvdnav/dvdnavsrc.c
@@ -330,6 +330,7 @@ gst_dvd_nav_src_set_property (GObject * object, guint prop_id,
       } else {
         g_warning ("dvdnavsrc: cannot change device while running");
       }
+      GST_OBJECT_UNLOCK (src);
       break;
 #if 0
     case ARG_TITLE: