diff --git a/lib/e2p/ChangeLog b/lib/e2p/ChangeLog
index 557bdfd8..dc5d04f7 100644
--- a/lib/e2p/ChangeLog
+++ b/lib/e2p/ChangeLog
@@ -1,3 +1,10 @@
+2007-04-02  Theodore Tso  <tytso@mit.edu>
+
+	* parse_num.c (parse_num_blocks): When parsing the 's' prefix,
+		take into account the filesystem blocksize so we return
+		the correct answer for non-1k blocksize filesystems.
+		(Addresses Debian Bug: #408298)
+
 2007-03-21  Theodore Tso  <tytso@mit.edu>
 
 	* feature.c (e2p_edit_feature), mntopts.c (e2p_edit_mntopts): Fix
diff --git a/lib/e2p/parse_num.c b/lib/e2p/parse_num.c
index 3910e70d..7e9ee71a 100644
--- a/lib/e2p/parse_num.c
+++ b/lib/e2p/parse_num.c
@@ -32,7 +32,7 @@ unsigned long parse_num_blocks(const char *arg, int log_block_size)
 		num >>= log_block_size; 
 		break;
 	case 's': 
-		num >>= 1;
+		num >>= (1+log_block_size);
 		break;
 	case '\0':
 		break;