diff --git a/sys/boot/amd64/boot1.efi/Makefile.fat b/sys/boot/amd64/boot1.efi/Makefile.fat
index 6005781fad39..324481e1a315 100644
--- a/sys/boot/amd64/boot1.efi/Makefile.fat
+++ b/sys/boot/amd64/boot1.efi/Makefile.fat
@@ -1,3 +1,3 @@
 # This file autogenerated by generate-fat.sh - DO NOT EDIT
 # $FreeBSD$
-BOOT1_OFFSET=0x3b
+BOOT1_OFFSET=0x2d
diff --git a/sys/boot/amd64/boot1.efi/fat.tmpl.bz2.uu b/sys/boot/amd64/boot1.efi/fat.tmpl.bz2.uu
index 2dafbf5bd241..52ed67a468cb 100644
--- a/sys/boot/amd64/boot1.efi/fat.tmpl.bz2.uu
+++ b/sys/boot/amd64/boot1.efi/fat.tmpl.bz2.uu
@@ -2,24 +2,20 @@ FAT template boot filesystem created by generate-fat.sh
 DO NOT EDIT
 $FreeBSD$
 begin 644 fat.tmpl.bz2
-M0EIH.3%!629362<X?*4`'$M________________________^`T`8`!0$#%$"
-M0$($26(<P`+]@@``08$T::&FFF)B:&FFA@(P",(#)@)IHP$`8`$R,`FF0#(`
-M8AID!55*,3)B/29#)H9,U,F1HT#308&B#3",$&0:--I`PC3)H`R::,"9-`R9
-M&$&!-&FAIIIB8FAIIH8",`C"`R8"::,!`&`!,C`)ID`R`&(:9`5))$Q*>0F1
-MIH#31H--/48U#0--&":#0`80&@TT,@`-&FF"&F@'J::&U/34NO5O]KH&,P3D
-M9TC0KV+%M5^)$Y=$D2(S=*LB`@R"#`))MDFE$%&-NDVQ;AN6'M4LC-TEV[;Q
-MO4PF6^32;0F_3B=<!/)]P7"4#AN(H7%<9QW(<E1.4HW+<QS7.0J12J93JA4H
-M:J5;GN@Z+I(:L=-6*U7*]8.HZJQ62S2ZT6KK.N[#LK9;NT[;N.ZN'>=]<O`N
-MD1=O"\3QO(\J\7J]7R_>9YV`]#!83TL-$>IZWL>U[G#?8XC[6LXKC..Y"]R7
-MW+2`DCI_O6(CB*@F:HXU$D_U22''VTEI>J0$D<5XJTGX,_@%TB=+22<.G#2]
-M8%U/0HF\H&"DJE]1'D[:R*HAO::Y1KJ51.W[.PJD;.AF*B305`)(Y*D=,J3E
-M*C32FALJLNY<P*93W5YF*=$IQU.`L6-.HP.$[I<9C"M*JD4QN57Y6Z'FK\?B
-MH64E.:LD:EHV\H=:H/3=1>U!J@"Z_P%2`,'![YLW>M2IC2`:`CEJ&T49+FZ_
-M1LE?,Y33\]9\*FD5,=K=4NCB[FR1Y"F3ZC%OGB-9C3?UV/,;:Y_5*B>JJ2SV
-M'4VCKU)D*&.INFX6:M1L6Q:1<O*,QA]=<P,BTPWK[0W7FOQU632YRP7U&%AQ
-M*N5LEBY4NTSK%.Y7B;M1VC`LZJF)3*7+&)HFR:3&E],AB;Y_R\R&X9+6N$OS
-MG.@F!CKTC7,*\N.>HC>J9JLU)CN\93G:R2HF-)RY."9[:-NSFY;)AW3_&>YC
-MGE^<EGLW+WC-:)@V^HRU+@$D4`>RL\!$JAO6TM%S=C+LRM7_XNY(IPH2!.</
-"E*``
+M0EIH.3%!62936=AO?&0`&J9____[ZZKJJ_^N_ZO^Z_^[OO_\`5`(0!0&#$D"
+M0$)$2&(<P`(\K5,M9"5%&DQ---,FAH,0```T````R-!HQ`&30`-&"#)ID$JF
+M1)[U4_5-&@`T```#0&AH````````````(,F`$P`!,`1IA&````"9-,308`1@
+M````!))!BDVI/U0`]0R>H:`81HT#)D!H-#U`T#31IH-&(``R8$9_I)6[MY/,
+M(H=/()+4&!(3V0"20C3J5$L5@2`219,"T6JI,@0"2*2\=LAD6=>N6<O!'F<.
+MQ2`;9$.P]202R&N9I3BX[E0;C7/9BF'`((K?M1ZK0B2Q;BLJ9!(`21P&1:;B
+MDD)S!-L5BL5BL/173`@@M!!!!!X@BQ0@@@@@@CJ"A!!!"!`TWD!B!`@0($"J
+M9(E`B,1(D2)$B;V]S&-,&#!@P8,'1\*$+59`:41,';;/)32*G*Q52N![20F8
+M9CCYSB#!2=[EG.),$:P,>(8QSW'U+N42P^'5X@7X``23=EA``#Z,O)^-VTX@
+M`+E!=,&6PV11C:*D8K#^<%FTG-%!@PR72@\ZU0B<D6I$FT/1\<A#/`;ET5$)
+MKT-MBW97\J.P/H0ADE"(EBN6";@5#$2#!(\F/E8M+!8-A-S"+$U5[\J>F1Y]
+MF-FPGL2L>4QCU&O/>89^#H$6^<;&WKC9W52KUX."CM6+GD;(=1!MUD,,?Y[]
+MTLAG0];,:B^]M%BH0J1":_C-*2I9R3AS#,&0>$RCY'T/R?HR!?'5$MILQ:!"
+M+;10A*!&^<(_/8>D8<CDN9]HO)OH13W(Q())?'R2WTV9*G_4T<=Y!'1+'9,(
+J1-/V<ME.&9Q3LKI2S$(`$D,``'_=FF*).\[A.)#4HU1=R13A0D-AO?&0
 `
 end
diff --git a/sys/boot/amd64/boot1.efi/generate-fat.sh b/sys/boot/amd64/boot1.efi/generate-fat.sh
index ccd63afee48c..eafd3e00dfe2 100755
--- a/sys/boot/amd64/boot1.efi/generate-fat.sh
+++ b/sys/boot/amd64/boot1.efi/generate-fat.sh
@@ -20,7 +20,7 @@ OUTPUT_FILE=fat.tmpl
 
 dd if=/dev/zero of=$OUTPUT_FILE bs=512 count=$FAT_SIZE
 DEVICE=`mdconfig -a -f $OUTPUT_FILE`
-newfs_msdos -F 32 $DEVICE
+newfs_msdos -F 12 $DEVICE
 mkdir stub
 mount -t msdosfs /dev/$DEVICE stub