diff --git a/far/changelog b/far/changelog
index 0f264de364..98eead6942 100644
--- a/far/changelog
+++ b/far/changelog
@@ -1,3 +1,7 @@
+drkns 22.05.2017 23:20:20 +0000 - build 4966
+
+1. Уточнение 4963.
+
 drkns 22.05.2017 20:44:12 +0000 - build 4965
 
 1. Ещё всякое на тему gcc 7.
diff --git a/far/strmix.cpp b/far/strmix.cpp
index 8e6e7fab42..33ed4dd47a 100644
--- a/far/strmix.cpp
+++ b/far/strmix.cpp
@@ -602,7 +602,8 @@ string FileSizeToStr(unsigned long long FileSize, int WidthWithSign, unsigned lo
 	size_t UnitIndex = 0;
 	auto Str = ToStr(FileSize);
 
-	const auto SuffixSize = UseCompact? 1u : 2u;
+	const auto SuffixSize = (ShowUnit || (Width && Str.size() > Width))? UseCompact? 1u : 2u : 0u;
+	
 	const auto MaxNumberWidth = Width > SuffixSize? Width - SuffixSize : 0;
 
 	while ((UseUnit && UnitIndex < MinUnit) || (Width && Str.size() > MaxNumberWidth))
diff --git a/far/vbuild.m4 b/far/vbuild.m4
index 1516931c83..91435a14e9 100644
--- a/far/vbuild.m4
+++ b/far/vbuild.m4
@@ -1 +1 @@
-m4_define(BUILD,4965)m4_dnl
+m4_define(BUILD,4966)m4_dnl