diff --git a/sys/conf/files.ia64 b/sys/conf/files.ia64
index 7de7f33af734..7fccde890d95 100644
--- a/sys/conf/files.ia64
+++ b/sys/conf/files.ia64
@@ -18,56 +18,10 @@ atkbdmap.h			optional	atkbd_dflt_keymap	\
 	no-obj no-implicit-rule before-depend				\
 	clean		"atkbdmap.h"
 #
-ia64/acpica/acpi_machdep.c	optional	acpi
-ia64/acpica/acpi_wakeup.c	optional	acpi
-ia64/acpica/OsdEnvironment.c	optional	acpi
-ia64/acpica/madt.c		optional	acpi
-ia64/ia32/ia32_misc.c		optional	ia32
-ia64/ia32/ia32_sysent.c		optional	ia32
-ia64/ia32/ia32_sysvec.c		optional	ia32
-ia64/ia64/ia64-gdbstub.c	optional	ddb
-ia64/ia64/autoconf.c		standard
-ia64/ia64/busdma_machdep.c	standard
-ia64/ia64/clock.c		standard
-ia64/ia64/clock_if.m		standard
-ia64/ia64/critical.c		standard
-ia64/ia64/db_disasm.c		optional	ddb
-ia64/ia64/db_interface.c	optional	ddb
-ia64/ia64/db_trace.c		optional	ddb
-ia64/ia64/dump_machdep.c	standard
-ia64/ia64/efi.c			standard
-ia64/ia64/eficlock.c		standard
-ia64/ia64/elf_machdep.c		standard
-ia64/ia64/exception.s		standard
-ia64/ia64/in_cksum.c		optional	inet
-ia64/ia64/interrupt.c		standard
-ia64/ia64/locore.s		standard	no-obj
-ia64/ia64/machdep.c		standard
-ia64/ia64/mca.c			standard
-ia64/ia64/mem.c			standard
-ia64/ia64/mp_machdep.c		optional	smp
-ia64/ia64/nexus.c		standard
-ia64/ia64/pal.s			standard
-ia64/ia64/pmap.c		standard
-ia64/ia64/sal.c			standard
-ia64/ia64/sapic.c		standard
-ia64/ia64/setjmp.s		standard
-ia64/ia64/support.s		standard
-ia64/ia64/ssc.c			optional	ski
-ia64/ia64/sscdisk.c		optional	ski
-ia64/ia64/swtch.s		standard
-ia64/ia64/sys_machdep.c		standard
-ia64/ia64/trap.c		standard
-ia64/ia64/unaligned.c		standard
-ia64/ia64/unwind.c		standard
-ia64/ia64/vm_machdep.c		standard
-ia64/isa/isa.c			optional	isa
-ia64/isa/isa_dma.c		optional	isa
-ia64/pci/pci_cfgreg.c		optional	pci
-crypto/blowfish/bf_enc.c	optional	ipsec ipsec_esp
-crypto/des/des_enc.c		optional	ipsec ipsec_esp
 crypto/blowfish/bf_enc.c	optional	crypto
+crypto/blowfish/bf_enc.c	optional	ipsec ipsec_esp
 crypto/des/des_enc.c		optional	crypto
+crypto/des/des_enc.c		optional	ipsec ipsec_esp
 dev/advansys/adv_isa.c		optional	adv isa
 dev/aic/aic_isa.c		optional	aic isa
 dev/fb/fb.c			optional	fb
@@ -84,9 +38,9 @@ dev/sio/sio.c			optional	sio
 dev/sio/sio_isa.c		optional	sio isa
 dev/syscons/schistory.c		optional	sc
 dev/syscons/scmouse.c		optional	sc
-dev/syscons/scterm.c		optional	sc
 dev/syscons/scterm-dumb.c	optional	sc
 dev/syscons/scterm-sc.c		optional	sc
+dev/syscons/scterm.c		optional	sc
 dev/syscons/scvgarndr.c		optional	sc vga
 dev/syscons/scvidctl.c		optional	sc
 dev/syscons/scvtb.c		optional	sc
@@ -97,6 +51,52 @@ geom/geom_bsd_enc.c		standard
 geom/geom_gpt.c			standard
 geom/geom_mbr.c			standard
 geom/geom_mbr_enc.c		standard
+ia64/acpica/OsdEnvironment.c	optional	acpi
+ia64/acpica/acpi_machdep.c	optional	acpi
+ia64/acpica/acpi_wakeup.c	optional	acpi
+ia64/acpica/madt.c		optional	acpi
+ia64/ia32/ia32_misc.c		optional	ia32
+ia64/ia32/ia32_sysent.c		optional	ia32
+ia64/ia32/ia32_sysvec.c		optional	ia32
+ia64/ia64/autoconf.c		standard
+ia64/ia64/busdma_machdep.c	standard
+ia64/ia64/clock.c		standard
+ia64/ia64/clock_if.m		standard
+ia64/ia64/critical.c		standard
+ia64/ia64/db_disasm.c		optional	ddb
+ia64/ia64/db_interface.c	optional	ddb
+ia64/ia64/db_trace.c		optional	ddb
+ia64/ia64/dump_machdep.c	standard
+ia64/ia64/efi.c			standard
+ia64/ia64/eficlock.c		standard
+ia64/ia64/elf_machdep.c		standard
+ia64/ia64/exception.s		standard
+ia64/ia64/ia64-gdbstub.c	optional	ddb
+ia64/ia64/in_cksum.c		optional	inet
+ia64/ia64/interrupt.c		standard
+ia64/ia64/locore.s		standard	no-obj
+ia64/ia64/machdep.c		standard
+ia64/ia64/mca.c			standard
+ia64/ia64/mem.c			standard
+ia64/ia64/mp_machdep.c		optional	smp
+ia64/ia64/nexus.c		standard
+ia64/ia64/pal.s			standard
+ia64/ia64/pmap.c		standard
+ia64/ia64/sal.c			standard
+ia64/ia64/sapic.c		standard
+ia64/ia64/setjmp.s		standard
+ia64/ia64/ssc.c			optional	ski
+ia64/ia64/sscdisk.c		optional	ski
+ia64/ia64/support.s		standard
+ia64/ia64/swtch.s		standard
+ia64/ia64/sys_machdep.c		standard
+ia64/ia64/trap.c		standard
+ia64/ia64/unaligned.c		standard
+ia64/ia64/unwind.c		standard
+ia64/ia64/vm_machdep.c		standard
+ia64/isa/isa.c			optional	isa
+ia64/isa/isa_dma.c		optional	isa
+ia64/pci/pci_cfgreg.c		optional	pci
 isa/atkbd_isa.c			optional	atkbd
 isa/atkbdc_isa.c		optional	atkbdc
 isa/fd.c			optional	fdc
@@ -105,15 +105,15 @@ isa/psm.c			optional	psm
 isa/syscons_isa.c		optional	sc
 isa/vga_isa.c			optional	vga
 kern/imgact_elf32.c		optional	ia32
-libkern/ia64/bswap16.S		standard
-libkern/ia64/bswap32.S		standard
-libkern/ia64/__divsi3.S		standard
-libkern/ia64/__modsi3.S		standard
-libkern/ia64/__udivsi3.S	standard
-libkern/ia64/__umodsi3.S	standard
-libkern/ia64/__divdi3.S		standard
-libkern/ia64/__moddi3.S		standard
-libkern/ia64/__udivdi3.S	standard
-libkern/ia64/__umoddi3.S	standard
 libkern/bcmp.c			standard
 libkern/ffs.c			standard
+libkern/ia64/__divdi3.S		standard
+libkern/ia64/__divsi3.S		standard
+libkern/ia64/__moddi3.S		standard
+libkern/ia64/__modsi3.S		standard
+libkern/ia64/__udivdi3.S	standard
+libkern/ia64/__udivsi3.S	standard
+libkern/ia64/__umoddi3.S	standard
+libkern/ia64/__umodsi3.S	standard
+libkern/ia64/bswap16.S		standard
+libkern/ia64/bswap32.S		standard