diff --git a/ChangeLog b/ChangeLog
index 342b74f..51fcdf7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Thu Jan 12 2006  John (J5) Palmieri <johnp@redhat.com>
+
+	* libnotify/notifynotification.c (notify_notification_set_user_data):
+	fix free function addition
+	(notify_notification_get_user_data): added method for actually
+	getting the user data (fd.o bug# 5418)
+	- patches provided by Duarte Henriques 
+	<duarte.henriques at gmail dot com>
+
+
 Tue Jan 10 23:33:47 PST 2006  Christian Hammond <chipx86@chipx86.com>
 
 	* configure.ac:
diff --git a/libnotify/notifynotification.c b/libnotify/notifynotification.c
index 08ac75e..57635eb 100644
--- a/libnotify/notifynotification.c
+++ b/libnotify/notifynotification.c
@@ -398,12 +398,22 @@ notify_notification_set_user_data (NotifyNotification * notification,
       priv->user_data_free_func (priv->user_data);
 
   priv->user_data = user_data;
-  priv->user_data_free_func = priv->user_data;
+  priv->user_data_free_func = free_func;
 
   /* TODO: return FALSE on OOM */
   return TRUE;
 }
 
+gpointer
+notify_notification_get_user_data (NotifyNotification * notification)
+{
+  NotifyNotificationPrivate *priv;
+
+  priv = notification->priv;
+
+  return priv->user_data;
+}
+
 static void 
 _close_signal_handler (DBusGProxy *proxy, 
                        guint32 id, 
diff --git a/libnotify/notifynotification.h b/libnotify/notifynotification.h
index c0da83f..a00ca5e 100644
--- a/libnotify/notifynotification.h
+++ b/libnotify/notifynotification.h
@@ -68,6 +68,8 @@ gboolean notify_notification_set_user_data (NotifyNotification *notification,
                                             void *user_data,
                                             GFreeFunc free_func);
 
+gpointer notify_notification_get_user_data (NotifyNotification *notification);
+
 gboolean notify_notification_show (NotifyNotification *notification, 
                                    GError **error);