diff --git a/ChangeLog b/ChangeLog
index b854a7e4..d8593245 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Sun Jul 14 19:37:37 CEST 2013
+	Name MHD worker threads on glibc >= 2.12. -,L4X[o](B
+
 Fri Jul  5 12:05:01 CEST 2013
 	Added MHD_OPTION_CONNECTION_MEMORY_INCREMENT to allow users
 	to specify a custom value for incrementing read buffer
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 41013db5..ea4c0538 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -939,6 +939,9 @@ create_thread (pthread_t *thread,
     }
   ret = pthread_create (thread, pattr,
 			start_routine, arg);
+#if (__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 12)
+  (void) pthread_setname_np (*thread, "libmicrohttpd");
+#endif
   if (0 != daemon->thread_stack_size) 
     pthread_attr_destroy (&attr);
   return ret;