diff -Nru kexec-tools-2.0.6/debian/changelog kexec-tools-2.0.6/debian/changelog
--- kexec-tools-2.0.6/debian/changelog	2015-07-10 16:42:41.000000000 +0000
+++ kexec-tools-2.0.6/debian/changelog	2017-07-19 12:46:42.000000000 +0000
@@ -1,3 +1,9 @@
+kexec-tools (1:2.0.6-0ubuntu2.3) trusty; urgency=medium
+
+  * Fixes non-efi systems, upstream code regression not present (LP: #1705054)
+
+ -- Rafael David Tinoco <rafael.tinoco@canonical.com>  Tue, 18 Jul 2017 15:11:24 +0000
+
 kexec-tools (1:2.0.6-0ubuntu2.2) trusty; urgency=medium
 
   * Fixes kexec load failure on Power8 (LP: #1461078)
diff -Nru kexec-tools-2.0.6/debian/patches/fix-erroneous-memory-descriptor-message.patch kexec-tools-2.0.6/debian/patches/fix-erroneous-memory-descriptor-message.patch
--- kexec-tools-2.0.6/debian/patches/fix-erroneous-memory-descriptor-message.patch	1970-01-01 00:00:00.000000000 +0000
+++ kexec-tools-2.0.6/debian/patches/fix-erroneous-memory-descriptor-message.patch	2017-07-19 12:50:08.000000000 +0000
@@ -0,0 +1,50 @@
+Description: kexec/i386: fix erroneous memory descriptor message
+ On non-EFI systems, efi_info section of boot_params is zero filled resulting
+ in an erroneous message from kexec regarding "efi memory descriptor" version.
+
+ Caused by commit: e1ffc9e9a0769e1f54185003102e9bec428b84e8 "Passing efi related
+ data via setup_data"
+
+ 0000700 0000 0000 0000 0000 0000 0000 0000 0000
+ 0000720 0000 0000 0000 0000 0000 0000 0000 0000
+ 0000740
+
+ efi memory descriptor version 0 is not supported!
+
+Author: Tony Jones <tonyj@suse.de>
+Origin: upstream, https://github.com/horms/kexec-tools/commit/3e5443fffb2c311a61fe157be25b80de53329604
+Bug: http://lists.infradead.org/pipermail/kexec/2014-March/011360.html
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1705054
+Reviewed-By: Rafael David Tinoco <rafael.tinoco@canonical.com>
+Last-Update: 2017-07-18
+--- a/kexec/arch/i386/x86-linux-setup.c
++++ b/kexec/arch/i386/x86-linux-setup.c
+@@ -686,17 +686,25 @@
+ 	ret = get_bootparam(&real_mode->efi_info, offset, 32);
+ 	if (ret)
+ 		return;
++	if (((struct efi_info *)real_mode->efi_info)->efi_memmap_size == 0)
++		/* zero filled efi_info */
++		goto out;
+ 	desc_version = get_efi_mem_desc_version(real_mode);
+ 	if (desc_version != 1) {
+ 		fprintf(stderr,
+ 			"efi memory descriptor version %d is not supported!\n",
+ 			desc_version);
+-		memset(&real_mode->efi_info, 0, 32);
+-		return;
++		goto out;
+ 	}
+ 	ret = setup_efi_data(info, real_mode);
+ 	if (ret)
+-		memset(&real_mode->efi_info, 0, 32);
++		goto out;
++
++	return;
++
++out:
++	memset(&real_mode->efi_info, 0, 32);
++	return;
+ }
+ 
+ void setup_linux_system_parameters(struct kexec_info *info,
diff -Nru kexec-tools-2.0.6/debian/patches/series kexec-tools-2.0.6/debian/patches/series
--- kexec-tools-2.0.6/debian/patches/series	2015-07-10 16:42:39.000000000 +0000
+++ kexec-tools-2.0.6/debian/patches/series	2017-07-19 12:46:42.000000000 +0000
@@ -14,3 +14,4 @@
 kexec-ppc64-disabling-exception-handling-when-buildi.patch
 ppc64-kdump-Fix-ELF-header-endianess.patch
 Use-slurp_file_len-to-avoid-partial-read.patch
+fix-erroneous-memory-descriptor-message.patch