diff --git a/ChangeLog b/ChangeLog
index 2887347eff..a2a1d65016 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,15 @@
+2005-03-23  Tristan van Berkom  <tristan.van.berkom@gmail.com>
+
+	Reviewed by: Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+	* gst/elements/gstfilesrc.c: (gst_filesrc_set_property):
+	  Fix broken handling of mmapsize property. Remove useless
+	  g_object_notify(). Fixes #171400.
+
 2005-03-23  Stefan Kost  <ensonic@users.sf.net>
 
 	* tools/gst-inspect.c: (print_interfaces), (print_element_info):
-    added listing implemented interfaces to gst-inspect
+	  added listing implemented interfaces to gst-inspect
 
 2005-03-21  Tim-Philipp Müller  <tim at centricular dot net>
 
diff --git a/gst/elements/gstfilesrc.c b/gst/elements/gstfilesrc.c
index a67f9c4e19..98105cc6ec 100644
--- a/gst/elements/gstfilesrc.c
+++ b/gst/elements/gstfilesrc.c
@@ -320,6 +320,7 @@ gst_filesrc_set_property (GObject * object, guint prop_id, const GValue * value,
     GParamSpec * pspec)
 {
   GstFileSrc *src;
+  gulong ul;
 
   /* it's not null if we got it, but it might not be ours */
   g_return_if_fail (GST_IS_FILESRC (object));
@@ -332,21 +333,19 @@ gst_filesrc_set_property (GObject * object, guint prop_id, const GValue * value,
       break;
     case ARG_BLOCKSIZE:
       src->block_size = g_value_get_ulong (value);
-      g_object_notify (G_OBJECT (src), "blocksize");
       break;
     case ARG_MMAPSIZE:
-      if ((src->mapsize % src->pagesize) == 0) {
-        src->mapsize = g_value_get_ulong (value);
-        g_object_notify (G_OBJECT (src), "mmapsize");
+      ul = g_value_get_ulong (value);
+      if ((ul % src->pagesize) == 0) {
+        src->mapsize = ul;
       } else {
         GST_INFO_OBJECT (src,
-            "invalid mapsize, must be a multiple of pagesize, which is %d",
-            src->pagesize);
+            "invalid mapsize %d, must be a multiple of pagesize, which is %d",
+            ul, src->pagesize);
       }
       break;
     case ARG_TOUCH:
       src->touch = g_value_get_boolean (value);
-      g_object_notify (G_OBJECT (src), "touch");
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
diff --git a/plugins/elements/gstfilesrc.c b/plugins/elements/gstfilesrc.c
index a67f9c4e19..98105cc6ec 100644
--- a/plugins/elements/gstfilesrc.c
+++ b/plugins/elements/gstfilesrc.c
@@ -320,6 +320,7 @@ gst_filesrc_set_property (GObject * object, guint prop_id, const GValue * value,
     GParamSpec * pspec)
 {
   GstFileSrc *src;
+  gulong ul;
 
   /* it's not null if we got it, but it might not be ours */
   g_return_if_fail (GST_IS_FILESRC (object));
@@ -332,21 +333,19 @@ gst_filesrc_set_property (GObject * object, guint prop_id, const GValue * value,
       break;
     case ARG_BLOCKSIZE:
       src->block_size = g_value_get_ulong (value);
-      g_object_notify (G_OBJECT (src), "blocksize");
       break;
     case ARG_MMAPSIZE:
-      if ((src->mapsize % src->pagesize) == 0) {
-        src->mapsize = g_value_get_ulong (value);
-        g_object_notify (G_OBJECT (src), "mmapsize");
+      ul = g_value_get_ulong (value);
+      if ((ul % src->pagesize) == 0) {
+        src->mapsize = ul;
       } else {
         GST_INFO_OBJECT (src,
-            "invalid mapsize, must be a multiple of pagesize, which is %d",
-            src->pagesize);
+            "invalid mapsize %d, must be a multiple of pagesize, which is %d",
+            ul, src->pagesize);
       }
       break;
     case ARG_TOUCH:
       src->touch = g_value_get_boolean (value);
-      g_object_notify (G_OBJECT (src), "touch");
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);