diff --git a/capplets/screensaver/ChangeLog b/capplets/screensaver/ChangeLog
index e5b26481c..2d6808e30 100644
--- a/capplets/screensaver/ChangeLog
+++ b/capplets/screensaver/ChangeLog
@@ -1,3 +1,10 @@
+2001-07-19  Bradford Hovinen  <hovinen@ximian.com>
+
+	* main.c (setup_capplet_widget): Use capplet->dialog for parent of
+	prefs widget
+
+	* prefs-widget.c: Added copyright notice
+
 2001-07-18  Carlos Perelló Marín <carlos@gnome-db.org>
 
 	* screensavers/*.xml: /s/label/_label, /s/low-label/_low-label/,
diff --git a/capplets/screensaver/main.c b/capplets/screensaver/main.c
index 5a2d7eb50..9942af256 100644
--- a/capplets/screensaver/main.c
+++ b/capplets/screensaver/main.c
@@ -226,7 +226,7 @@ setup_capplet_widget (void)
 
 	prefs->frozen++;
 
-	prefs_widget = PREFS_WIDGET (prefs_widget_new (GTK_WINDOW (capplet)));
+	prefs_widget = PREFS_WIDGET (prefs_widget_new (GTK_WINDOW (capplet->dialog)));
 
 	gtk_container_add (GTK_CONTAINER (capplet), GTK_WIDGET (prefs_widget));
 
diff --git a/capplets/screensaver/prefs-widget.c b/capplets/screensaver/prefs-widget.c
index 2a1af184b..e708a2c7a 100644
--- a/capplets/screensaver/prefs-widget.c
+++ b/capplets/screensaver/prefs-widget.c
@@ -1,3 +1,28 @@
+/* -*- mode: c; style: linux -*- */
+
+/* preferences.c
+ * Copyright (C) 2000, 2001 Ximian, Inc.
+ *
+ * Written by Bradford Hovinen <hovinen@ximian.com>,
+ *            Richard Hestilow <tvgm@ximian.com>
+ * Parts written by Jamie Zawinski <jwz@jwz.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
 #ifdef HAVE_CONFIG_H
 #   include "config.h"
 #endif