diff --git a/ChangeLog b/ChangeLog
index 20e3f58f40..a9fb3ad2ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-11-15  Daniel Fischer  <dan at f3c dot com>
+
+	Reviewed by: Tim-Philipp Müller  <tim at centricular dot net>
+
+	* gst/gstpad.c: (gst_pad_get_property):
+	  GST_PAD_PAD_TEMPLATE(pad) gets the pad template, while
+	  GST_PAD_TEMPLATE(pad) does a cast. We want the former here.
+	  (#321452)
+
 2005-11-15  Wim Taymans  <wim@fluendo.com>
 
 	* gst/gstevent.c:
diff --git a/gst/gstpad.c b/gst/gstpad.c
index af7c683aae..2a9530506f 100644
--- a/gst/gstpad.c
+++ b/gst/gstpad.c
@@ -440,7 +440,7 @@ gst_pad_get_property (GObject * object, guint prop_id,
       g_value_set_enum (value, GST_PAD_DIRECTION (object));
       break;
     case PAD_PROP_TEMPLATE:
-      g_value_set_object (value, GST_PAD_TEMPLATE (object));
+      g_value_set_object (value, GST_PAD_PAD_TEMPLATE (object));
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);