diff --git a/ChangeLog b/ChangeLog
index a46e5cd70..b0181f8b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-10  Havoc Pennington  <hp@redhat.com>
+
+	* src/display.c: properly attribute selection code to Matthias
+	Clasen
+
 2002-07-10  Havoc Pennington  <hp@pobox.com>
 
 	* README: couple of updates
diff --git a/src/display.c b/src/display.c
index d597b965a..51c0ac2c8 100644
--- a/src/display.c
+++ b/src/display.c
@@ -3106,9 +3106,7 @@ find_screen_for_selection (MetaDisplay *display,
   return NULL;
 }
 
-/* from fvwm2, Copyright Dominik Vogt I assume, but it
- * was unmarked.
- */
+/* from fvwm2, Copyright Matthias Clasen, Dominik Vogt */
 static gboolean
 convert_property (MetaDisplay *display,
                   MetaScreen  *screen,
@@ -3155,9 +3153,7 @@ convert_property (MetaDisplay *display,
   return TRUE;
 }
 
-/* from fvwm2, Copyright Dominik Vogt I assume, but it
- * was unmarked.
- */
+/* from fvwm2, Copyright Matthias Clasen, Dominik Vogt */
 static void
 process_selection_request (MetaDisplay   *display,
                            XEvent        *event)
diff --git a/src/screen.c b/src/screen.c
index f0a98b7c5..4a5161485 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2001, 2002 Havoc Pennington
  * Copyright (C) 2002 Red Hat Inc.
  * Some ICCCM manager selection code derived from fvwm2,
- * Copyright (C) 2001 Dominik Vogt and fvwm2 team
+ * Copyright (C) 2001 Dominik Vogt, Matthias Clasen, and fvwm2 team
  * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as