diff --git a/sysdeps/riscv/atomic-machine.h b/sysdeps/riscv/atomic-machine.h
index dced351b5c6..37dec648cc2 100644
--- a/sysdeps/riscv/atomic-machine.h
+++ b/sysdeps/riscv/atomic-machine.h
@@ -1,7 +1,7 @@
 /* Low-level functions for atomic operations. RISC-V version.
    Copyright (C) 2011-2016 Free Software Foundation, Inc.
 
-   Contributed by Andrew Waterman (waterman@cs.berkeley.edu) at UC Berkeley.
+   Contributed by Andrew Waterman (andrew@sifive.com).
 
    This file is part of the GNU C Library.
 
diff --git a/sysdeps/riscv/memset.S b/sysdeps/riscv/memset.S
index 660d59467e8..ac2ac0a36c3 100644
--- a/sysdeps/riscv/memset.S
+++ b/sysdeps/riscv/memset.S
@@ -1,5 +1,5 @@
-/* Copyright (C) 2014 Free Software Foundation, Inc.
-   Contributed by Andrew Waterman (waterman@cs.berkeley.edu) at UC Berkeley.
+/* Copyright (C) 2011-2016 Free Software Foundation, Inc.
+   Contributed by Andrew Waterman (andrew@sifive.com).
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/sysdeps/riscv/strcmp.S b/sysdeps/riscv/strcmp.S
index d6b6eec7fe4..04806bbbc1a 100644
--- a/sysdeps/riscv/strcmp.S
+++ b/sysdeps/riscv/strcmp.S
@@ -1,4 +1,20 @@
-# Artisanally coded in California by A. Shell Waterman
+/* Copyright (C) 2011-2016 Free Software Foundation, Inc.
+   Contributed by Andrew Waterman (andrew@sifive.com).
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library.  If not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
 #include <sys/asm.h>
diff --git a/sysdeps/unix/sysv/linux/riscv/sysdep.c b/sysdeps/unix/sysv/linux/riscv/sysdep.c
index 85829d9673b..4cfe9f0e037 100644
--- a/sysdeps/unix/sysv/linux/riscv/sysdep.c
+++ b/sysdeps/unix/sysv/linux/riscv/sysdep.c
@@ -1,6 +1,6 @@
-/* Copyright (C) 2015 Free Software Foundation, Inc.
+/* Copyright (C) 2011-2016 Free Software Foundation, Inc.
+   Contributed by Andrew Waterman (andrew@sifive.com).
    This file is part of the GNU C Library.
-   Contributed by Andrew Waterman (waterman@cs.berkeley.edu).
 
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library.  If not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
 #include <errno.h>