diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d4e52354834..d667af78c68 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2012-04-18  Pedro Alves  <palves@redhat.com>
+
+	Revert gnulib/ part of:
+	2011-01-01  Joel Brobecker  <brobecker@adacore.com>
+	Copyright year update in most files (performed by copyright.sh).
+
 2012-04-18  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	Fix 64-bit constants on 32-bit hosts.
diff --git a/gdb/gnulib/Makefile.am b/gdb/gnulib/Makefile.am
index a75959194d5..1296c01387f 100644
--- a/gdb/gnulib/Makefile.am
+++ b/gdb/gnulib/Makefile.am
@@ -1,6 +1,6 @@
 ## DO NOT EDIT! GENERATED AUTOMATICALLY!
 ## Process this file with automake to produce Makefile.in.
-# Copyright (C) 2002-2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2010 Free Software Foundation, Inc.
 #
 # This file is free software, distributed under the terms of the GNU
 # General Public License.  As a special exception to the GNU General
diff --git a/gdb/gnulib/dummy.c b/gdb/gnulib/dummy.c
index 0563b441f38..0f9a277962f 100644
--- a/gdb/gnulib/dummy.c
+++ b/gdb/gnulib/dummy.c
@@ -1,5 +1,5 @@
 /* A dummy file, to prevent empty libraries from breaking builds.
-   Copyright (C) 2004, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2007, 2009, 2010 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
diff --git a/gdb/gnulib/extra/arg-nonnull.h b/gdb/gnulib/extra/arg-nonnull.h
index cf4989699d0..7e3e2db82e1 100644
--- a/gdb/gnulib/extra/arg-nonnull.h
+++ b/gdb/gnulib/extra/arg-nonnull.h
@@ -1,5 +1,5 @@
 /* A C macro for declaring that specific arguments must not be NULL.
-   Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 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
diff --git a/gdb/gnulib/extra/c++defs.h b/gdb/gnulib/extra/c++defs.h
index cc6a6a437e9..0c2fad7a215 100644
--- a/gdb/gnulib/extra/c++defs.h
+++ b/gdb/gnulib/extra/c++defs.h
@@ -1,5 +1,5 @@
 /* C++ compatible function declaration macros.
-   Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2010 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
diff --git a/gdb/gnulib/extra/warn-on-use.h b/gdb/gnulib/extra/warn-on-use.h
index dc882c7c451..171e5991638 100644
--- a/gdb/gnulib/extra/warn-on-use.h
+++ b/gdb/gnulib/extra/warn-on-use.h
@@ -1,5 +1,5 @@
 /* A C macro for emitting warnings if a function is used.
-   Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2010 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
diff --git a/gdb/gnulib/m4/00gnulib.m4 b/gdb/gnulib/m4/00gnulib.m4
index 7feed466940..301469b31ce 100644
--- a/gdb/gnulib/m4/00gnulib.m4
+++ b/gdb/gnulib/m4/00gnulib.m4
@@ -1,5 +1,5 @@
 # 00gnulib.m4 serial 2
-dnl Copyright (C) 2009-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gdb/gnulib/m4/extensions.m4 b/gdb/gnulib/m4/extensions.m4
index 1330503f0d7..7d9458a8d65 100644
--- a/gdb/gnulib/m4/extensions.m4
+++ b/gdb/gnulib/m4/extensions.m4
@@ -1,7 +1,7 @@
 # serial 9  -*- Autoconf -*-
 # Enable extensions on systems that normally disable them.
 
-# Copyright (C) 2003, 2006-2011 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006-2010 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/gdb/gnulib/m4/gnulib-cache.m4 b/gdb/gnulib/m4/gnulib-cache.m4
index 910cd40a4ba..de1c99454c2 100644
--- a/gdb/gnulib/m4/gnulib-cache.m4
+++ b/gdb/gnulib/m4/gnulib-cache.m4
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2010 Free Software Foundation, Inc.
 #
 # This file is free software, distributed under the terms of the GNU
 # General Public License.  As a special exception to the GNU General
diff --git a/gdb/gnulib/m4/gnulib-common.m4 b/gdb/gnulib/m4/gnulib-common.m4
index 7b2ce2b39a5..4c7ac30d0fa 100644
--- a/gdb/gnulib/m4/gnulib-common.m4
+++ b/gdb/gnulib/m4/gnulib-common.m4
@@ -1,5 +1,5 @@
 # gnulib-common.m4 serial 20
-dnl Copyright (C) 2007-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gdb/gnulib/m4/gnulib-comp.m4 b/gdb/gnulib/m4/gnulib-comp.m4
index b1d0f8d9654..abde4aa479d 100644
--- a/gdb/gnulib/m4/gnulib-comp.m4
+++ b/gdb/gnulib/m4/gnulib-comp.m4
@@ -1,5 +1,5 @@
 # DO NOT EDIT! GENERATED AUTOMATICALLY!
-# Copyright (C) 2002-2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2010 Free Software Foundation, Inc.
 #
 # This file is free software, distributed under the terms of the GNU
 # General Public License.  As a special exception to the GNU General
diff --git a/gdb/gnulib/m4/gnulib-tool.m4 b/gdb/gnulib/m4/gnulib-tool.m4
index ed41e9d4159..69e7733b990 100644
--- a/gdb/gnulib/m4/gnulib-tool.m4
+++ b/gdb/gnulib/m4/gnulib-tool.m4
@@ -1,5 +1,5 @@
 # gnulib-tool.m4 serial 2
-dnl Copyright (C) 2004-2005, 2009-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2005, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gdb/gnulib/m4/include_next.m4 b/gdb/gnulib/m4/include_next.m4
index 1314c338fd6..c7e0672f60c 100644
--- a/gdb/gnulib/m4/include_next.m4
+++ b/gdb/gnulib/m4/include_next.m4
@@ -1,5 +1,5 @@
 # include_next.m4 serial 14
-dnl Copyright (C) 2006-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gdb/gnulib/m4/longlong.m4 b/gdb/gnulib/m4/longlong.m4
index a4d95aa1ab7..cca3c1a90fa 100644
--- a/gdb/gnulib/m4/longlong.m4
+++ b/gdb/gnulib/m4/longlong.m4
@@ -1,5 +1,5 @@
 # longlong.m4 serial 14
-dnl Copyright (C) 1999-2007, 2009-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 1999-2007, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gdb/gnulib/m4/memchr.m4 b/gdb/gnulib/m4/memchr.m4
index b2b09bdc337..ab773b8129c 100644
--- a/gdb/gnulib/m4/memchr.m4
+++ b/gdb/gnulib/m4/memchr.m4
@@ -1,5 +1,5 @@
 # memchr.m4 serial 8
-dnl Copyright (C) 2002-2004, 2009-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2004, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gdb/gnulib/m4/mmap-anon.m4 b/gdb/gnulib/m4/mmap-anon.m4
index 82f4a3ca8de..a6b7b9ac3b4 100644
--- a/gdb/gnulib/m4/mmap-anon.m4
+++ b/gdb/gnulib/m4/mmap-anon.m4
@@ -1,5 +1,5 @@
 # mmap-anon.m4 serial 8
-dnl Copyright (C) 2005, 2007, 2009-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2007, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gdb/gnulib/m4/multiarch.m4 b/gdb/gnulib/m4/multiarch.m4
index 9ea85af2ec2..389bd2bbaa6 100644
--- a/gdb/gnulib/m4/multiarch.m4
+++ b/gdb/gnulib/m4/multiarch.m4
@@ -1,5 +1,5 @@
 # multiarch.m4 serial 5
-dnl Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gdb/gnulib/m4/stddef_h.m4 b/gdb/gnulib/m4/stddef_h.m4
index c4014339329..c3ae5694319 100644
--- a/gdb/gnulib/m4/stddef_h.m4
+++ b/gdb/gnulib/m4/stddef_h.m4
@@ -1,6 +1,6 @@
 dnl A placeholder for POSIX 2008 <stddef.h>, for platforms that have issues.
 # stddef_h.m4 serial 2
-dnl Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gdb/gnulib/m4/stdint.m4 b/gdb/gnulib/m4/stdint.m4
index 9a588de347e..1cc57e6e960 100644
--- a/gdb/gnulib/m4/stdint.m4
+++ b/gdb/gnulib/m4/stdint.m4
@@ -1,5 +1,5 @@
 # stdint.m4 serial 34
-dnl Copyright (C) 2001-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gdb/gnulib/m4/string_h.m4 b/gdb/gnulib/m4/string_h.m4
index 75310fb7f08..1977aecf915 100644
--- a/gdb/gnulib/m4/string_h.m4
+++ b/gdb/gnulib/m4/string_h.m4
@@ -1,6 +1,6 @@
 # Configure a GNU-like replacement for <string.h>.
 
-# Copyright (C) 2007-2011 Free Software Foundation, Inc.
+# Copyright (C) 2007-2010 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/gdb/gnulib/m4/warn-on-use.m4 b/gdb/gnulib/m4/warn-on-use.m4
index 6d599963b85..42daae87b8f 100644
--- a/gdb/gnulib/m4/warn-on-use.m4
+++ b/gdb/gnulib/m4/warn-on-use.m4
@@ -1,5 +1,5 @@
 # warn-on-use.m4 serial 2
-dnl Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gdb/gnulib/m4/wchar_h.m4 b/gdb/gnulib/m4/wchar_h.m4
index a7434459675..8cae82dd0b9 100644
--- a/gdb/gnulib/m4/wchar_h.m4
+++ b/gdb/gnulib/m4/wchar_h.m4
@@ -1,6 +1,6 @@
 dnl A placeholder for ISO C99 <wchar.h>, for platforms that have issues.
 
-dnl Copyright (C) 2007-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gdb/gnulib/m4/wchar_t.m4 b/gdb/gnulib/m4/wchar_t.m4
index 1b572e3c555..ed804e664ba 100644
--- a/gdb/gnulib/m4/wchar_t.m4
+++ b/gdb/gnulib/m4/wchar_t.m4
@@ -1,5 +1,5 @@
 # wchar_t.m4 serial 3 (gettext-0.18)
-dnl Copyright (C) 2002-2003, 2008-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2003, 2008-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gdb/gnulib/m4/wint_t.m4 b/gdb/gnulib/m4/wint_t.m4
index a0236e8d0e8..a6c7d15cb50 100644
--- a/gdb/gnulib/m4/wint_t.m4
+++ b/gdb/gnulib/m4/wint_t.m4
@@ -1,5 +1,5 @@
 # wint_t.m4 serial 4 (gettext-0.18)
-dnl Copyright (C) 2003, 2007-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2007-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gdb/gnulib/memchr.c b/gdb/gnulib/memchr.c
index 6d903b1014f..6c2b2d6c7dc 100644
--- a/gdb/gnulib/memchr.c
+++ b/gdb/gnulib/memchr.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2011
+/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2010
    Free Software Foundation, Inc.
 
    Based on strlen implementation by Torbjorn Granlund (tege@sics.se),
diff --git a/gdb/gnulib/memmem.c b/gdb/gnulib/memmem.c
index 47f66a2ed63..a23c4f7054a 100644
--- a/gdb/gnulib/memmem.c
+++ b/gdb/gnulib/memmem.c
@@ -1,5 +1,5 @@
 /* Copyright (C) 1991, 1992, 1993, 1994, 1996, 1997, 1998, 2000, 2004, 2007,
-   2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+   2008, 2009, 2010 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gdb/gnulib/stddef.in.h b/gdb/gnulib/stddef.in.h
index 32922b3b5a9..08778a2336d 100644
--- a/gdb/gnulib/stddef.in.h
+++ b/gdb/gnulib/stddef.in.h
@@ -1,6 +1,6 @@
 /* A substitute for POSIX 2008 <stddef.h>, for platforms that have issues.
 
-   Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 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
diff --git a/gdb/gnulib/stdint.in.h b/gdb/gnulib/stdint.in.h
index 8a8fe3f3afa..5da5f17886a 100644
--- a/gdb/gnulib/stdint.in.h
+++ b/gdb/gnulib/stdint.in.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2002, 2004-2011 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2002, 2004-2010 Free Software Foundation, Inc.
    Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood.
    This file is part of gnulib.
 
diff --git a/gdb/gnulib/str-two-way.h b/gdb/gnulib/str-two-way.h
index 7868eb81530..c08f60ef085 100644
--- a/gdb/gnulib/str-two-way.h
+++ b/gdb/gnulib/str-two-way.h
@@ -1,5 +1,5 @@
 /* Byte-wise substring search, using the Two-Way algorithm.
-   Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Eric Blake <ebb9@byu.net>, 2008.
 
diff --git a/gdb/gnulib/string.in.h b/gdb/gnulib/string.in.h
index db3530add0f..13c0f095203 100644
--- a/gdb/gnulib/string.in.h
+++ b/gdb/gnulib/string.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <string.h>.
 
-   Copyright (C) 1995-1996, 2001-2011 Free Software Foundation, Inc.
+   Copyright (C) 1995-1996, 2001-2010 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
diff --git a/gdb/gnulib/wchar.in.h b/gdb/gnulib/wchar.in.h
index 7c598e6f542..88d47dbc09c 100644
--- a/gdb/gnulib/wchar.in.h
+++ b/gdb/gnulib/wchar.in.h
@@ -1,6 +1,6 @@
 /* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
 
-   Copyright (C) 2007-2011 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 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