diff --git a/package/yast2-storage-ng.changes b/package/yast2-storage-ng.changes
index db42548deb..73a7c9ecc8 100644
--- a/package/yast2-storage-ng.changes
+++ b/package/yast2-storage-ng.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Oct 27 11:33:55 UTC 2017 - jsrain@suse.cz
+
+- Limit maximal proposed size of EFI partition (bsc#1062775)
+- 4.0.13
+
 -------------------------------------------------------------------
 Thu Oct 26 15:30:53 UTC 2017 - ancor@suse.com
 
diff --git a/package/yast2-storage-ng.spec b/package/yast2-storage-ng.spec
index ef8f69c770..22e25231fc 100644
--- a/package/yast2-storage-ng.spec
+++ b/package/yast2-storage-ng.spec
@@ -16,7 +16,7 @@
 #
 
 Name:		yast2-storage-ng
-Version:        4.0.12
+Version:        4.0.13
 Release:	0
 BuildArch:	noarch
 
diff --git a/src/lib/y2storage/boot_requirements_strategies/uefi.rb b/src/lib/y2storage/boot_requirements_strategies/uefi.rb
index 146caf7f07..f3af3743be 100644
--- a/src/lib/y2storage/boot_requirements_strategies/uefi.rb
+++ b/src/lib/y2storage/boot_requirements_strategies/uefi.rb
@@ -39,6 +39,7 @@ def needed_partitions(target)
 
       MIN_SIZE = DiskSize.MiB(33).freeze
       DESIRED_SIZE = DiskSize.MiB(500).freeze
+      MAX_SIZE = DiskSize.MiB(500).freeze
 
       def efi_missing?
         free_mountpoint?("/boot/efi")
@@ -51,7 +52,7 @@ def efi_partition(target)
         else
           vol.partition_id = PartitionId::ESP
           vol.min_size = target == :min ? MIN_SIZE : DESIRED_SIZE
-          vol.max_size = DiskSize.unlimited
+          vol.max_size = MAX_SIZE
           vol.max_start_offset = DiskSize.TiB(2)
         end
         vol
diff --git a/test/support/proposed_partitions_examples.rb b/test/support/proposed_partitions_examples.rb
index a89361ffcc..e380bbf337 100644
--- a/test/support/proposed_partitions_examples.rb
+++ b/test/support/proposed_partitions_examples.rb
@@ -102,16 +102,18 @@
   context "when aiming for the recommended size" do
     let(:target) { :desired }
 
-    it "requires /boot/efi to be at least 500 MiB large" do
+    it "requires /boot/efi to be exactly 500 MiB large" do
       expect(efi_part.min_size).to eq 500.MiB
+      expect(efi_part.max_size).to eq 500.MiB
     end
   end
 
   context "when aiming for the minimal size" do
     let(:target) { :min }
 
-    it "requires /boot/efi to be at least 33 MiB large" do
+    it "requires /boot/efi to be between 33 MiB and 500 MiB large" do
       expect(efi_part.min_size).to eq 33.MiB
+      expect(efi_part.max_size).to eq 500.MiB
     end
   end
 end