diff --git a/ChangeLog b/ChangeLog
index b00f4df3fbb873cd7e81b93791881b9ec61571ad..05e8b6c700038acc12b691a3eee61b00d0672363 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-02-22  Cosimo Cecchi  <cosimoc@gnome.org>
+
+	* libnautilus-private/nautilus-file-operations.c
+	(seconds_count_format_time_units), (format_time):
+	don't add 30 seconds when formatting time, as float->int conversion
+	already truncates the value for us (#572284).
+
 2009-02-21  Cosimo Cecchi  <cosimoc@gnome.org>
 
 	* configure.in:
diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c
index 0dc2ce0fbb6c960f1852e433210e4e159a09de5b..1e888896f4272eb0989776341108556a9b5232e8 100644
--- a/libnautilus-private/nautilus-file-operations.c
+++ b/libnautilus-private/nautilus-file-operations.c
@@ -228,7 +228,7 @@ seconds_count_format_time_units (int seconds)
 
 	if (seconds < 60*60) {
 		/* minutes */
-		minutes = (seconds + 30) / 60;
+		minutes = seconds / 60;
 		return minutes;
 	}
 
@@ -236,7 +236,7 @@ seconds_count_format_time_units (int seconds)
 
 	if (seconds < 60*60*4) {
 		/* minutes + hours */
-		minutes = (seconds - hours * 60 * 60 + 30) / 60;
+		minutes = (seconds - hours * 60 * 60) / 60;
 		return minutes + hours;
 	}
 
@@ -260,7 +260,7 @@ format_time (int seconds)
 	}
 
 	if (seconds < 60*60) {
-		minutes = (seconds + 30) / 60;
+		minutes = seconds / 60;
 		return g_strdup_printf (ngettext ("%'d minute", "%'d minutes", minutes), minutes);
 	}
 
@@ -269,7 +269,7 @@ format_time (int seconds)
 	if (seconds < 60*60*4) {
 		char *h, *m;
 
-		minutes = (seconds - hours * 60 * 60 + 30) / 60;
+		minutes = (seconds - hours * 60 * 60) / 60;
 		
 		h = g_strdup_printf (ngettext ("%'d hour", "%'d hours", hours), hours);
 		m = g_strdup_printf (ngettext ("%'d minute", "%'d minutes", minutes), minutes);