diff -Nru debian-installer-20101020ubuntu526/build/config/amd64.cfg debian-installer-20101020ubuntu527/build/config/amd64.cfg
--- debian-installer-20101020ubuntu526/build/config/amd64.cfg	2017-12-19 01:05:44.000000000 +0000
+++ debian-installer-20101020ubuntu527/build/config/amd64.cfg	2018-01-03 18:39:33.000000000 +0000
@@ -2,7 +2,7 @@
 MEDIUM_SUPPORTED_EXTRA = monolithic
 
 # The version of the kernel to use.
-BASEVERSION = 4.13.0-17
+BASEVERSION = 4.13.0-25
 KERNELVERSION = $(BASEVERSION)-generic
 KERNELMAJOR = 2.6
 KERNEL_FLAVOUR = di
diff -Nru debian-installer-20101020ubuntu526/build/config/arm64.cfg debian-installer-20101020ubuntu527/build/config/arm64.cfg
--- debian-installer-20101020ubuntu526/build/config/arm64.cfg	2017-12-19 01:05:44.000000000 +0000
+++ debian-installer-20101020ubuntu527/build/config/arm64.cfg	2018-01-03 18:39:33.000000000 +0000
@@ -1,7 +1,7 @@
 MEDIUM_SUPPORTED = cdrom netboot device-tree
 
 KERNELMAJOR = 2.6
-KERNELVERSION = 4.13.0-17-generic
+KERNELVERSION = 4.13.0-25-generic
 KERNEL_FLAVOUR = di
 KERNELIMAGEVERSION = $(KERNELVERSION)
 KERNELNAME = vmlinuz
@@ -70,9 +70,10 @@
 
 	if [ "$(GRUB_EFI)" = y ]; then \
 		xorriso -as mkisofs -r -J -c boot.cat \
-			-boot-load-size 4 -boot-info-table \
-			-eltorito-alt-boot \
-			--efi-boot boot/grub/efi.img -no-emul-boot \
+			-partition_offset 16 \
+			-append_partition 2 0xef $(TEMP_GRUB_EFI)/efi.img \
+			-e --interval:appended_partition_2:all:: \
+			-no-emul-boot \
 			-o $(TEMP_MINIISO) $(TEMP_CD_TREE); \
 	fi
 
diff -Nru debian-installer-20101020ubuntu526/build/config/armel.cfg debian-installer-20101020ubuntu527/build/config/armel.cfg
--- debian-installer-20101020ubuntu526/build/config/armel.cfg	2017-12-19 01:05:44.000000000 +0000
+++ debian-installer-20101020ubuntu527/build/config/armel.cfg	2018-01-03 18:39:33.000000000 +0000
@@ -2,7 +2,7 @@
 #SUBARCH_SUPPORTED = iop32x ixp4xx kirkwood orion5x versatile ads dove omap4
 
 KERNELMAJOR = 2.6
-KERNELVERSION = 4.13.0-17
+KERNELVERSION = 4.13.0-25
 KERNEL_FLAVOUR = di
 KERNELIMAGEVERSION = $(KERNELVERSION)
 KERNELNAME = $(foreach ver,$(KERNELVERSION),vmlinuz-$(ver))
diff -Nru debian-installer-20101020ubuntu526/build/config/armhf.cfg debian-installer-20101020ubuntu527/build/config/armhf.cfg
--- debian-installer-20101020ubuntu526/build/config/armhf.cfg	2017-12-19 01:05:44.000000000 +0000
+++ debian-installer-20101020ubuntu527/build/config/armhf.cfg	2018-01-03 18:39:33.000000000 +0000
@@ -3,7 +3,7 @@
 MKLIBS = mklibs-copy --ldlib=/lib/ld-linux-armhf.so.3
 
 KERNELMAJOR = 2.6
-KERNELVERSION = 4.13.0-17
+KERNELVERSION = 4.13.0-25
 KERNEL_FLAVOUR = di
 KERNELIMAGEVERSION = $(KERNELVERSION)
 KERNELNAME = $(foreach ver,$(KERNELVERSION),vmlinuz-$(ver))
diff -Nru debian-installer-20101020ubuntu526/build/config/i386.cfg debian-installer-20101020ubuntu527/build/config/i386.cfg
--- debian-installer-20101020ubuntu526/build/config/i386.cfg	2017-12-19 01:05:44.000000000 +0000
+++ debian-installer-20101020ubuntu527/build/config/i386.cfg	2018-01-03 18:39:33.000000000 +0000
@@ -2,7 +2,7 @@
 MEDIUM_SUPPORTED_EXTRA = monolithic
 
 # The version of the kernel to use.
-BASEVERSION = 4.13.0-17
+BASEVERSION = 4.13.0-25
 KERNELVERSION = $(BASEVERSION)-generic
 KERNELMAJOR = 2.6
 KERNEL_FLAVOUR = di
diff -Nru debian-installer-20101020ubuntu526/build/config/powerpc.cfg debian-installer-20101020ubuntu527/build/config/powerpc.cfg
--- debian-installer-20101020ubuntu526/build/config/powerpc.cfg	2017-12-19 01:05:44.000000000 +0000
+++ debian-installer-20101020ubuntu527/build/config/powerpc.cfg	2018-01-03 18:39:33.000000000 +0000
@@ -1,7 +1,7 @@
 SUBARCH_SUPPORTED = powerpc powerpc64 e500mc # apus prep
 
 KERNELMAJOR = 2.6
-BASEVERSION = 4.13.0-17
+BASEVERSION = 4.13.0-25
 
 # create the kernels with builtin initrd.
 builtin_initrd: $(TEMP_KERNEL) $(TEMP_INITRD)
diff -Nru debian-installer-20101020ubuntu526/build/config/ppc64el.cfg debian-installer-20101020ubuntu527/build/config/ppc64el.cfg
--- debian-installer-20101020ubuntu526/build/config/ppc64el.cfg	2017-12-19 01:05:44.000000000 +0000
+++ debian-installer-20101020ubuntu527/build/config/ppc64el.cfg	2018-01-03 18:39:33.000000000 +0000
@@ -1,7 +1,7 @@
 MEDIUM_SUPPORTED = netboot cdrom
 
 KERNELMAJOR = 2.6
-BASEVERSION = 4.13.0-17
+BASEVERSION = 4.13.0-25
 KERNELVERSION = $(BASEVERSION)-generic
 KERNEL_FLAVOUR = di
 KERNELNAME = vmlinux
diff -Nru debian-installer-20101020ubuntu526/build/config/s390x.cfg debian-installer-20101020ubuntu527/build/config/s390x.cfg
--- debian-installer-20101020ubuntu526/build/config/s390x.cfg	2017-12-19 01:05:44.000000000 +0000
+++ debian-installer-20101020ubuntu527/build/config/s390x.cfg	2018-01-03 18:39:33.000000000 +0000
@@ -3,7 +3,7 @@
 KERNEL = $(DEST)/image.ubuntu
 
 KERNELMAJOR = 2.6
-BASEVERSION = 4.13.0-17
+BASEVERSION = 4.13.0-25
 KERNELVERSION = $(BASEVERSION)-generic
 KERNEL_FLAVOUR = di
 KERNELNAME = vmlinuz
diff -Nru debian-installer-20101020ubuntu526/debian/changelog debian-installer-20101020ubuntu527/debian/changelog
--- debian-installer-20101020ubuntu526/debian/changelog	2017-12-19 01:06:18.000000000 +0000
+++ debian-installer-20101020ubuntu527/debian/changelog	2018-01-03 18:39:33.000000000 +0000
@@ -1,3 +1,20 @@
+debian-installer (20101020ubuntu527) bionic; urgency=medium
+
+  [ dann frazier ]
+  * arm64-efi/netboot: Improvements to mini.iso generation:
+    - Add an EFI System Partition to fix booting from USB stick on
+      same platforms LP: #1692876.
+    - Remove no-op arguments -boot-load-size and -boot-info-table.
+    - Use simpler "-e" instead of "--efi-boot" since we only have 1
+      el torito image.
+    - Add -partition_offset 16 so that the output of commands like
+      'isosize' is correct.
+
+  [ Adam Conrad ]
+  * Move master kernels to 4.13.0-25.
+
+ -- dann frazier <dannf@ubuntu.com>  Wed, 03 Jan 2018 11:39:33 -0700
+
 debian-installer (20101020ubuntu526) bionic; urgency=medium
 
   * Rebuild with fixed busybox 1:1.27.2-2ubuntu3. LP: #1737662.