diff --git a/ChangeLog b/ChangeLog
index dac4ad15de..e9ce1412d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-24  Sterling Augustine  <saugustine@google.com>
+
+	* sysdeps/x86_64/start.S (_start): Use ENTRY and END macros.
+
 2014-11-24  Ryan Cumming  <etaoins@gmail.com>
 
 	[BZ #17608]
diff --git a/sysdeps/x86_64/start.S b/sysdeps/x86_64/start.S
index e3d4ff8e20..97e972e680 100644
--- a/sysdeps/x86_64/start.S
+++ b/sysdeps/x86_64/start.S
@@ -55,11 +55,7 @@
 
 #include <sysdep.h>
 
-	.text
-	.globl _start
-	.type _start,@function
-_start:
-	cfi_startproc
+ENTRY (_start)
 	/* Clearing frame pointer is insufficient, use CFI.  */
 	cfi_undefined (rip)
 	/* Clear the frame pointer.  The ABI suggests this be done, to mark
@@ -123,7 +119,7 @@ _start:
 #endif
 
 	hlt			/* Crash if somehow `exit' does return.	 */
-	cfi_endproc
+END (_start)
 
 /* Define a symbol for the first piece of initialized data.  */
 	.data