--- core/pxelinux.asm.original	2010-05-10 01:15:06.000000000 -0700
+++ core/pxelinux.asm	2010-05-10 01:15:06.000000000 -0700
@@ -806,6 +806,16 @@
 		jnz .success
 
 .no_option:
+
+               ; Try linux.config
+
+		mov di,ConfigName
+		mov si,linuxconfig
+		mov cx,linuxconfig_len
+		rep movsb
+		call .try
+		jnz .success
+
 		mov di,ConfigName
 		mov si,cfgprefix
 		mov cx,cfgprefix_len
@@ -2876,6 +2886,8 @@
 syslinux_banner	db CR, LF, MY_NAME, ' ', VERSION_STR, ' ', DATE_STR, ' ', 0
 cfgprefix	db 'pxelinux.cfg/'		; No final null!
 cfgprefix_len	equ ($-cfgprefix)
+linuxconfig	db 'linux.config'
+linuxconfig_len	equ ($-linuxconfig)
 
 ; This one we make ourselves
 bootif_str	db 'BOOTIF='