Index: glib/gfileutils.c
===================================================================
--- glib/gfileutils.c	(revision 6385)
+++ glib/gfileutils.c	(working copy)
@@ -1800,20 +1800,20 @@
   return str;
 }
 
-#define KILOBYTE_FACTOR 1024.0
-#define MEGABYTE_FACTOR (1024.0 * 1024.0)
-#define GIGABYTE_FACTOR (1024.0 * 1024.0 * 1024.0)
+#define KIBIBYTE_FACTOR 1024.0
+#define MEBIBYTE_FACTOR (1024.0 * 1024.0)
+#define GIBIBYTE_FACTOR (1024.0 * 1024.0 * 1024.0)
 
 /**
  * g_format_size_for_display:
  * @size: a size in bytes.
  * 
  * Formats a size (for example the size of a file) into a human readable string.
- * Sizes are rounded to the nearest size prefix (KB, MB, GB) and are displayed rounded to
+ * Sizes are rounded to the nearest size prefix (KiB, MiB, GiB) and are displayed rounded to
  * the nearest  tenth. E.g. the file size 3292528 bytes will be converted into
- * the string "3.1 MB".
+ * the string "3.1 MiB".
  *
- * The prefix units base is 1024 (i.e. 1 KB is 1024 bytes).
+ * The prefix units base is 1024 (i.e. 1 KiB is 1024 bytes).
  * 
  * Returns: a formatted string containing a human readable file size.
  *
@@ -1822,26 +1822,26 @@
 char *
 g_format_size_for_display (goffset size)
 {
-  if (size < (goffset) KILOBYTE_FACTOR)
+  if (size < (goffset) KIBIBYTE_FACTOR)
     return g_strdup_printf (dngettext(GETTEXT_PACKAGE, "%u byte", "%u bytes",(guint) size), (guint) size);
   else
     {
       gdouble displayed_size;
       
-      if (size < (goffset) MEGABYTE_FACTOR)
+      if (size < (goffset) MEBIBYTE_FACTOR)
 	{
-	  displayed_size = (gdouble) size / KILOBYTE_FACTOR;
-	  return g_strdup_printf (_("%.1f KB"), displayed_size);
+	  displayed_size = (gdouble) size / KIBIBYTE_FACTOR;
+	  return g_strdup_printf (_("%.1f KiB"), displayed_size);
 	}
-      else if (size < (goffset) GIGABYTE_FACTOR)
+      else if (size < (goffset) GIBIBYTE_FACTOR)
 	{
-	  displayed_size = (gdouble) size / MEGABYTE_FACTOR;
-	  return g_strdup_printf (_("%.1f MB"), displayed_size);
+	  displayed_size = (gdouble) size / MEBIBYTE_FACTOR;
+	  return g_strdup_printf (_("%.1f MiB"), displayed_size);
 	}
       else
 	{
-	  displayed_size = (gdouble) size / GIGABYTE_FACTOR;
-	  return g_strdup_printf (_("%.1f GB"), displayed_size);
+	  displayed_size = (gdouble) size / GIBIBYTE_FACTOR;
+	  return g_strdup_printf (_("%.1f GiB"), displayed_size);
 	}
     }
 }
Index: glib/gslice.c
===================================================================
--- glib/gslice.c	(revision 6385)
+++ glib/gslice.c	(working copy)
@@ -95,7 +95,7 @@
  *     at certain thresholds.
  * [3] magazine sizes are bound by an implementation specific minimum size and
  *     a chunk size specific maximum to limit magazine storage sizes to roughly
- *     16KB.
+ *     16KiB.
  * [4] allocating ca. 8 chunks per block/page keeps a good balance between
  *     external and internal fragmentation (<= 12.5%). [Bonwick94]
  */
@@ -310,9 +310,9 @@
   slice_config_init (&allocator->config);
   allocator->min_page_size = sys_page_size;
 #if HAVE_COMPLIANT_POSIX_MEMALIGN || HAVE_MEMALIGN
-  /* allow allocation of pages up to 8KB (with 8KB alignment).
+  /* allow allocation of pages up to 8KiB (with 8KiB alignment).
    * this is useful because many medium to large sized structures
-   * fit less than 8 times (see [4]) into 4KB pages.
+   * fit less than 8 times (see [4]) into 4KiB pages.
    * we allow very small page sizes here, to reduce wastage in
    * threads if only small allocations are required (this does
    * bear the risk of incresing allocation times and fragmentation
@@ -511,7 +511,7 @@
    * cache for small to medium sized structures.
    * the upper bound of the magazine size is effectively provided by
    * MAX_MAGAZINE_SIZE. for larger chunks, this number is scaled down so that
-   * the content of a single magazine doesn't exceed ca. 16KB.
+   * the content of a single magazine doesn't exceed ca. 16KiB.
    */
   gsize chunk_size = SLAB_CHUNK_SIZE (allocator, ix);
   guint threshold = MAX (MIN_MAGAZINE_SIZE, allocator->max_page_size / MAX (5 * chunk_size, 5 * 32));
