diff --git a/[refs] b/[refs]
index 1f3ded236fd4..6dfcbd858cba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: da1a679cde9b12d6e331f43d2d92a234f2d1f9b0
+refs/heads/master: 18991197b4b588255ccabf472ebc84db7b66a19c
diff --git a/trunk/Makefile b/trunk/Makefile
index ddbfcac299c1..eccb03b88b8d 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -514,6 +514,12 @@ CFLAGS += $(call cc-option,-Wdeclaration-after-statement,)
 # disable pointer signed / unsigned warnings in gcc 4.0
 CFLAGS += $(call cc-option,-Wno-pointer-sign,)
 
+# Use --build-id when available.
+LDFLAGS_BUILD_ID = $(patsubst -Wl$(comma)%,%,\
+			      $(call ld-option, -Wl$(comma)--build-id,))
+LDFLAGS_MODULE += $(LDFLAGS_BUILD_ID)
+LDFLAGS_vmlinux += $(LDFLAGS_BUILD_ID)
+
 # Default kernel image to build when no specific target is given.
 # KBUILD_IMAGE may be overruled on the command line or
 # set in the environment