diff --git a/ChangeLog b/ChangeLog
index 8024863e99..f07dfafb68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2007-04-16  Tim-Philipp Müller  <tim at centricular dot net>
+
+	Patch by: Brian Cameron  <brian.cameron at sun dot com>
+
+	* sys/sunaudio/gstsunaudio.c:
+	* sys/sunaudio/gstsunaudiomixer.c:
+	* sys/sunaudio/gstsunaudiomixer.h:
+	* sys/sunaudio/gstsunaudiomixerctrl.c:
+	* sys/sunaudio/gstsunaudiomixerctrl.h:
+	* sys/sunaudio/gstsunaudiomixertrack.h:
+	* sys/sunaudio/gstsunaudiosink.c:
+	* sys/sunaudio/gstsunaudiosink.h:
+	* sys/sunaudio/gstsunaudiosrc.c:
+	* sys/sunaudio/gstsunaudiosrc.h:
+	  Fix and/or update copyright attributions (#430228).
+
 2007-04-13  Wim Taymans  <wim@fluendo.com>
 
 	* docs/plugins/gst-plugins-good-plugins-sections.txt:
diff --git a/sys/sunaudio/gstsunaudio.c b/sys/sunaudio/gstsunaudio.c
index b06bf15293..70024a4c85 100644
--- a/sys/sunaudio/gstsunaudio.c
+++ b/sys/sunaudio/gstsunaudio.c
@@ -1,6 +1,6 @@
 /*
- * GStreamer
- * Copyright (C) <2005> Brian Cameron <brian.cameron@sun.com>
+ * GStreamer - SunAudio plugin
+ * Copyright (C) 2005,2006 Brian Cameron <brian.cameron@sun.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
diff --git a/sys/sunaudio/gstsunaudiomixer.c b/sys/sunaudio/gstsunaudiomixer.c
index ba20992453..0f22e1d7f2 100644
--- a/sys/sunaudio/gstsunaudiomixer.c
+++ b/sys/sunaudio/gstsunaudiomixer.c
@@ -1,6 +1,6 @@
 /*
- * GStreamer
- * Copyright (C) 2005 Brian Cameron <brian.cameron@sun.com>
+ * GStreamer - SunAudio mixer
+ * Copyright (C) 2005,2006 Brian Cameron <brian.cameron@sun.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
diff --git a/sys/sunaudio/gstsunaudiomixer.h b/sys/sunaudio/gstsunaudiomixer.h
index 7b1e283ecf..20ff1a88b4 100644
--- a/sys/sunaudio/gstsunaudiomixer.h
+++ b/sys/sunaudio/gstsunaudiomixer.h
@@ -1,6 +1,6 @@
 /*
- * GStreamer
- * Copyright (C) 2005 Brian Cameron <brian.cameron@sun.com>
+ * GStreamer - SunAudio mixer
+ * Copyright (C) 2005,2006 Brian Cameron <brian.cameron@sun.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
diff --git a/sys/sunaudio/gstsunaudiomixerctrl.c b/sys/sunaudio/gstsunaudiomixerctrl.c
index 09aa3da7d9..067eb1176d 100644
--- a/sys/sunaudio/gstsunaudiomixerctrl.c
+++ b/sys/sunaudio/gstsunaudiomixerctrl.c
@@ -1,6 +1,6 @@
 /*
- * GStreamer
- * Copyright (C) 2005 Brian Cameron <brian.cameron@sun.com>
+ * GStreamer - SunAudio mixer interface element
+ * Copyright (C) 2005,2006 Brian Cameron <brian.cameron@sun.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
diff --git a/sys/sunaudio/gstsunaudiomixerctrl.h b/sys/sunaudio/gstsunaudiomixerctrl.h
index c4a74d99b4..c5e5f0e5eb 100644
--- a/sys/sunaudio/gstsunaudiomixerctrl.h
+++ b/sys/sunaudio/gstsunaudiomixerctrl.h
@@ -1,5 +1,6 @@
-/* SunAudio mixer interface element.
- * Copyright (C) 2005 Brian Cameron <brian.cameron@sun.com>
+/*
+ * GStreamer - SunAudio mixer interface element.
+ * Copyright (C) 2005,2006 Brian Cameron <brian.cameron@sun.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
diff --git a/sys/sunaudio/gstsunaudiomixertrack.h b/sys/sunaudio/gstsunaudiomixertrack.h
index fdf494d936..215f9c49cc 100644
--- a/sys/sunaudio/gstsunaudiomixertrack.h
+++ b/sys/sunaudio/gstsunaudiomixertrack.h
@@ -1,5 +1,6 @@
-/* GStreamer SunAudio Mixer implementation
- * Copyright (C) 2005 Brian Cameron <brian.cameron@sun.com>
+/*
+ * GStreamer SunAudio mixer track implementation
+ * Copyright (C) 2005,2006 Brian Cameron <brian.cameron@sun.com>
  *
  * gstsunaudiomixertrack.h: SunAudio mixer tracks
  *
diff --git a/sys/sunaudio/gstsunaudiosink.c b/sys/sunaudio/gstsunaudiosink.c
index a189905a58..8fb76d5eaa 100644
--- a/sys/sunaudio/gstsunaudiosink.c
+++ b/sys/sunaudio/gstsunaudiosink.c
@@ -1,7 +1,8 @@
 /*
- * GStreamer
+ * GStreamer - SunAudio sink
  * Copyright (C) 2004 David A. Schleef <ds@schleef.org>
- * Copyright (C) 2005 Brian Cameron <brian.cameron@sun.com>
+ * Copyright (C) 2005,2006 Brian Cameron <brian.cameron@sun.com>
+ * Copyright (C) 2006 Jan Schmidt <thaytan@mad.scientist.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
diff --git a/sys/sunaudio/gstsunaudiosink.h b/sys/sunaudio/gstsunaudiosink.h
index b1a3cc2659..b22110c6f5 100644
--- a/sys/sunaudio/gstsunaudiosink.h
+++ b/sys/sunaudio/gstsunaudiosink.h
@@ -1,6 +1,8 @@
-/* GStreamer
+/*
+ * GStreamer - SunAudio sink
  * Copyright (C) 2004 David A. Schleef <ds@schleef.org>
- * Copyright (C) 2005 Brian Cameron <brian.cameron@sun.com>
+ * Copyright (C) 2005,2006 Brian Cameron <brian.cameron@sun.com>
+ * Copyright (C) 2006 Jan Schmidt <thaytan@mad.scientist.com>
  *
  * gstsunaudiosink.h:
  *
diff --git a/sys/sunaudio/gstsunaudiosrc.c b/sys/sunaudio/gstsunaudiosrc.c
index c2fd12e943..318ed6731f 100644
--- a/sys/sunaudio/gstsunaudiosrc.c
+++ b/sys/sunaudio/gstsunaudiosrc.c
@@ -1,6 +1,6 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *               2000,2005 Wim Taymans <wim@fluendo.com>
+/*
+ * GStreamer - SunAudio source
+ * Copyright (C) 2005,2006 Brian Cameron <brian.cameron@sun.com>
  *
  * gstsunaudiosrc.c: 
  *
diff --git a/sys/sunaudio/gstsunaudiosrc.h b/sys/sunaudio/gstsunaudiosrc.h
index 1705566522..c71e8eacdd 100644
--- a/sys/sunaudio/gstsunaudiosrc.h
+++ b/sys/sunaudio/gstsunaudiosrc.h
@@ -1,6 +1,5 @@
-/* GStreamer
- * Copyright (C) 2004 David A. Schleef <ds@schleef.org>
- * Copyright (C) 2005 Brian Cameron <brian.cameron@sun.com>
+/* GStreamer - SunAudio source
+ * Copyright (C) 2005,2006 Brian Cameron <brian.cameron@sun.com>
  *
  * gstsunaudiosrc.h:
  *