diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 77e2cf7c6c..5ae496efe7 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-07  Joel Brobecker  <brobecker@adacore.com>
+
+	* gdb.base/watchpoints.c: Add copyright header.  Reformat one
+	of the comments.
+
 2009-10-06  Pierre Muller  <muller@ics.u-strasbg.fr>
 
 	* gdb.base/annota1.exp: Remove obsolete match_max increase.
diff --git a/gdb/testsuite/gdb.base/watchpoints.c b/gdb/testsuite/gdb.base/watchpoints.c
index fa9ba34095..e06b15eb70 100644
--- a/gdb/testsuite/gdb.base/watchpoints.c
+++ b/gdb/testsuite/gdb.base/watchpoints.c
@@ -1,11 +1,28 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+   Copyright 2009 Free Software Foundation, Inc.
+
+   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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
+
+   Please email any bugs, comments, and/or additions to this file to:
+   bug-gdb@gnu.org  */
+
+/* This source is mainly to test what happens when a watchpoint is
+   removed while another watchpoint, inserted later is left active.  */
+
 #include <stdio.h>
 #include <unistd.h>
-/*
- * This source is mainly to test
- * what happens when a watchpoint is removed
- * while another watchpoint, inserted later is
- * left active.
- */
 
 int count = -1;
 int ival1 = -1;