diff --git a/ChangeLog b/ChangeLog
index 09a120230b..f3e4e91686 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-03  Ronald Bultje  <rbultje@ronald.bitfreak.net>
+
+	* gst/gstelement.c: (gst_element_class_add_pad_template):
+	  Refuse registering a pad template if another pad template
+	  with the same name already exists (#114715).
+
 2004-01-02  David Schleef  <ds@schleef.org>
 
 	* gst/gstcaps.c: (_gst_structure_is_equal_foreach),
diff --git a/gst/gstelement.c b/gst/gstelement.c
index 6bd056d16c..ddfbffba37 100644
--- a/gst/gstelement.c
+++ b/gst/gstelement.c
@@ -1195,6 +1195,8 @@ gst_element_class_add_pad_template (GstElementClass *klass,
   g_return_if_fail (GST_IS_ELEMENT_CLASS (klass));
   g_return_if_fail (templ != NULL);
   g_return_if_fail (GST_IS_PAD_TEMPLATE (templ));
+  /* avoid registering pad templates with the same name */
+  g_return_if_fail (gst_element_class_get_pad_template (klass, templ->name_template) == NULL);
   
   templ_copy = g_memdup(templ, sizeof(GstPadTemplate));