diff --git a/ChangeLog b/ChangeLog
index 29d0d51477..f3dbabcc96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-09-22  Florian Weimer  <fweimer@redhat.com>
+
+	* nss/bug17079.c: Renamed from nss/bug18287.c.  Add description.
+	* nss/Makefile (tests): Update.
+
 2015-09-22  Florian Weimer  <fweimer@redhat.com>
 
 	* nss/bug18287.c: New file.
diff --git a/nss/Makefile b/nss/Makefile
index f6ef912cfc..02a50160cb 100644
--- a/nss/Makefile
+++ b/nss/Makefile
@@ -48,7 +48,7 @@ makedb-modules = xmalloc hash-string
 extra-objs		+= $(makedb-modules:=.o)
 
 tests			= test-netdb tst-nss-test1 test-digits-dots \
-			  tst-nss-getpwent bug18287
+			  tst-nss-getpwent bug17079
 xtests			= bug-erange
 
 # Specify rules for the nss_* modules.  We have some services.
diff --git a/nss/bug18287.c b/nss/bug17079.c
similarity index 98%
rename from nss/bug18287.c
rename to nss/bug17079.c
index 57abab0058..9846737bda 100644
--- a/nss/bug18287.c
+++ b/nss/bug17079.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2015 Free Software Foundation, Inc.
+/* Test for bug 17079: heap overflow in NSS with small buffers.
+   Copyright (C) 2015 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or