diff --git a/ChangeLog b/ChangeLog
index f3c8e1bee..c6c5ca242 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,49 @@
+2009-05-04  Pavel Roskin  <proski@gnu.org>
+
+	* disk/ata.c: Spelling fixes.
+	* disk/raid.c: Likewise.
+	* disk/usbms.c: Likewise.
+	* disk/dmraid_nvidia.c: Likewise.
+	* kern/ieee1275/openfw.c: Likewise.
+	* kern/ieee1275/init.c: Likewise.
+	* kern/ieee1275/cmain.c: Likewise.
+	* boot/i386/pc/cdboot.S: Likewise.
+	* video/readers/png.c: Likewise.
+	* video/i386/pc/vbe.c: Likewise.
+	* fs/udf.c: Likewise.
+	* fs/hfs.c: Likewise.
+	* fs/reiserfs.c: Likewise.
+	* efiemu/runtime/efiemu.c: Likewise.
+	* efiemu/main.c: Likewise.
+	* efiemu/mm.c: Likewise.
+	* include/grub/elf.h: Likewise.
+	* include/grub/xnu.h: Likewise.
+	* include/grub/usbdesc.h: Likewise.
+	* include/grub/usb.h: Likewise.
+	* include/grub/script_sh.h: Likewise.
+	* include/grub/lib/LzmaEnc.h: Likewise.
+	* include/grub/efiemu/efiemu.h: Likewise.
+	* include/grub/command.h: Likewise.
+	* normal/menu.c: Likewise.
+	* normal/main.c: Likewise.
+	* normal/datetime.c: Likewise.
+	* bus/usb/uhci.c: Likewise.
+	* mmap/i386/uppermem.c: Likewise.
+	* mmap/mmap.c: Likewise.
+	* commands/acpi.c: Likewise.
+	* commands/test.c: Likewise.
+	* partmap/apple.c: Likewise.
+	* font/font.c: Likewise.
+	* loader/sparc64/ieee1275/linux.c: Likewise.
+	* loader/macho.c: Likewise.
+	* loader/i386/bsd_trampoline.S: Likewise.
+	* loader/i386/bsd.c: Likewise.
+	* loader/xnu.c: Likewise.
+	* term/i386/pc/vesafb.c: Likewise.
+	* term/usb_keyboard.c: Likewise.
+	* util/resolve.c: Likewise.
+	* util/getroot.c: Likewise.
+
 2009-05-04  Felix Zielcke  <fzielcke@z-51.de>
 
 	* conf/i386-pc.rmk (libpkg_DATA): Rename to pkglib_DATA.
diff --git a/boot/i386/pc/cdboot.S b/boot/i386/pc/cdboot.S
index 02d4fce38..133f8dee5 100644
--- a/boot/i386/pc/cdboot.S
+++ b/boot/i386/pc/cdboot.S
@@ -46,7 +46,7 @@ next:
 	. = start + 8
 
 bi_pvd:
-	.long 0		/* LBA of primary volume descript.  */
+	.long 0		/* LBA of primary volume descriptor.  */
 bi_file:
 	.long 0		/* LBA of boot file. */
 bi_length:
diff --git a/bus/usb/uhci.c b/bus/usb/uhci.c
index 8406aed28..090934998 100644
--- a/bus/usb/uhci.c
+++ b/bus/usb/uhci.c
@@ -56,7 +56,7 @@ struct grub_uhci_qh
   grub_uint8_t pad[8];
 } __attribute__ ((packed));
 
-/* UHCI Tranfer Descriptor.  */
+/* UHCI Transfer Descriptor.  */
 struct grub_uhci_td
 {
   /* Pointer to the next TD in the list.  */
@@ -248,7 +248,7 @@ grub_uhci_pci_iter (int bus, int device, int func,
   grub_uhci_writereg32 (u, GRUB_UHCI_REG_FLBASEADD,
 			(grub_uint32_t) u->framelist);
 
-  /* Make the Queue Heads point to eachother.  */
+  /* Make the Queue Heads point to each other.  */
   for (i = 0; i < 256; i++)
     {
       /* Point to the next QH.  */
@@ -482,7 +482,7 @@ grub_uhci_transfer (grub_usb_controller_t dev,
   grub_dprintf ("uhci", "initiate transaction\n");
 
   /* Wait until either the transaction completed or an error
-     occured.  */
+     occurred.  */
   for (;;)
     {
       grub_uhci_td_t errtd;
@@ -507,30 +507,30 @@ grub_uhci_transfer (grub_usb_controller_t dev,
 	  if (errtd->ctrl_status & (1 << 22))
 	    err = GRUB_USB_ERR_STALL;
 
-	  /* Check if an error related to the data buffer occured.  */
+	  /* Check if an error related to the data buffer occurred.  */
 	  if (errtd->ctrl_status & (1 << 21))
 	    err = GRUB_USB_ERR_DATA;
 
-	  /* Check if a babble error occured.  */
+	  /* Check if a babble error occurred.  */
 	  if (errtd->ctrl_status & (1 << 20))
 	    err = GRUB_USB_ERR_BABBLE;
  
-	  /* Check if a NAK occured.  */
+	  /* Check if a NAK occurred.  */
 	  if (errtd->ctrl_status & (1 << 19))
 	    err = GRUB_USB_ERR_NAK;
 
-	  /* Check if a timeout occured.  */
+	  /* Check if a timeout occurred.  */
 	  if (errtd->ctrl_status & (1 << 18))
 	    err = GRUB_USB_ERR_TIMEOUT;
 
-	  /* Check if a bitstuff error occured.  */
+	  /* Check if a bitstuff error occurred.  */
 	  if (errtd->ctrl_status & (1 << 17))
 	    err = GRUB_USB_ERR_BITSTUFF;
 
 	  if (err)
 	    goto fail;
 
-	  /* Fall through, no errors occured, so the QH might be
+	  /* Fall through, no errors occurred, so the QH might be
 	     updated.  */
 	  grub_dprintf ("uhci", "transaction fallthrough\n");
 	}
@@ -660,7 +660,7 @@ GRUB_MOD_INIT(uhci)
 {
   grub_uhci_inithw ();
   grub_usb_controller_dev_register (&usb_controller);
-  grub_dprintf ("uhci", "registed\n");
+  grub_dprintf ("uhci", "registered\n");
 }
 
 GRUB_MOD_FINI(uhci)
diff --git a/commands/acpi.c b/commands/acpi.c
index 3521c4c54..7b53343a6 100644
--- a/commands/acpi.c
+++ b/commands/acpi.c
@@ -53,7 +53,7 @@ static const struct grub_arg_option options[] = {
   {"oemtablecreatorrev", 'd', 0, 
    "Set creator revision of RSDP, XSDT and RSDT", 0, ARG_TYPE_INT},  
   {"no-ebda", 'e', 0, "Don't update EBDA. May fix failures or hangs on some"
-   " BIOSes but makes it uneffective with OS not recieving RSDP fro GRUB", 
+   " BIOSes but makes it ineffective with OS not receiving RSDP from GRUB",
    0, ARG_TYPE_NONE},
   {0, 0, 0, 0, 0, 0}
 };
@@ -186,7 +186,7 @@ grub_acpi_create_ebda (void)
   if (! mmapregion)
     return grub_errno;
 
-  /* XXX: EBDA is unstandartised, so this implementation is heuristical. */
+  /* XXX: EBDA is unstandardized, so this implementation is heuristical. */
   if (ebda_kb_len)
     grub_memcpy (targetebda, ebda, 0x400);
   else
@@ -503,7 +503,7 @@ grub_cmd_acpi (struct grub_extcmd *cmd,
 	    *ptr = grub_tolower (*ptr);
 	}
 
-      /* Set revision variables to replicant the same version as host. */
+      /* Set revision variables to replicate the same version as host. */
       rev1 = ! rsdp->revision;
       rev2 = rsdp->revision;
       rsdt = (struct grub_acpi_table_header *) UINT_TO_PTR (rsdp->rsdt_addr);
@@ -558,7 +558,7 @@ grub_cmd_acpi (struct grub_extcmd *cmd,
 		  grub_memcpy (table_dsdt, dsdt, dsdt->length);
 		}
 
-	      /* Save FACS address. FACS shouldn't be overriden. */
+	      /* Save FACS address. FACS shouldn't be overridden. */
 	      facs_addr = fadt->facs_addr;
 	    }
   
diff --git a/commands/test.c b/commands/test.c
index 68b5efede..bbeeed0e8 100644
--- a/commands/test.c
+++ b/commands/test.c
@@ -35,7 +35,7 @@ grub_strtosl (char *arg, char **end, int base)
   return grub_strtoul (arg, end, base);
 }
 
-/* Parse a test expression startion from *argn. */
+/* Parse a test expression starting from *argn. */
 static int
 test_parse (char **args, int *argn, int argc)
 {
diff --git a/disk/ata.c b/disk/ata.c
index 812537ebe..ea42d5951 100644
--- a/disk/ata.c
+++ b/disk/ata.c
@@ -439,7 +439,7 @@ grub_ata_pciinit (int bus, int device, int func,
 	  grub_errno = GRUB_ERR_NONE;
 	  grub_ata_device_initialize (controller * 2 + i, 0, rega, regb);
 
-	  /* Most errors rised by grub_ata_device_initialize() are harmless.
+	  /* Most errors raised by grub_ata_device_initialize() are harmless.
 	     They just indicate this particular drive is not responding, most
 	     likely because it doesn't exist.  We might want to ignore specific
 	     error types here, instead of printing them.  */
@@ -586,7 +586,7 @@ grub_ata_readwrite (grub_disk_t disk, grub_disk_addr_t sector,
 
       grub_dprintf("ata", "rw=%d, sector=%llu, batch=%u\n", rw, sector, batch);
 
-      /* Send read/write commmand.  */
+      /* Send read/write command.  */
       if (grub_ata_setaddress (dev, addressing, sector, batch))
 	return grub_errno;
 
diff --git a/disk/dmraid_nvidia.c b/disk/dmraid_nvidia.c
index ee43bef54..119465109 100644
--- a/disk/dmraid_nvidia.c
+++ b/disk/dmraid_nvidia.c
@@ -42,7 +42,7 @@
 #define NV_LEVEL_1_0		0x8180
 
 #define NV_ARRAY_FLAG_BOOT		1 /* BIOS use only.  */
-#define NV_ARRAY_FLAG_ERROR		2 /* Degraded or offling.  */
+#define NV_ARRAY_FLAG_ERROR		2 /* Degraded or offline.  */
 #define NV_ARRAY_FLAG_PARITY_VALID	4 /* RAID-3/5 parity valid.  */
 
 struct grub_nv_array
diff --git a/disk/raid.c b/disk/raid.c
index 8b026cde0..5cb412bf9 100644
--- a/disk/raid.c
+++ b/disk/raid.c
@@ -573,7 +573,7 @@ insert_array (grub_disk_t disk, struct grub_raid_array *new_array,
       array->next = array_list;
       array_list = array;
 
-      /* RAID 1 doestn't use a chunksize but code assumes one so set
+      /* RAID 1 doesn't use a chunksize but code assumes one so set
 	 one. */
       if (array->level == 1)
 	array->chunk_size = 64;
diff --git a/disk/usbms.c b/disk/usbms.c
index d08256b65..67e6ba25f 100644
--- a/disk/usbms.c
+++ b/disk/usbms.c
@@ -179,7 +179,7 @@ grub_usbms_finddevs (void)
 	  /* XXX: Activate the first configuration.  */
 	  grub_usb_set_configuration (usbdev, 1);
 
-	  /* Bolk-Only Mass Storage Reset, after the reset commands
+	  /* Bulk-Only Mass Storage Reset, after the reset commands
 	     will be accepted.  */
 	  grub_usbms_reset (usbdev, i);
 
@@ -214,8 +214,8 @@ grub_usbms_iterate (int (*hook) (const char *name, int luns))
 }
 
 static grub_err_t
-grub_usbms_tranfer (struct grub_scsi *scsi, grub_size_t cmdsize, char *cmd,
-		    grub_size_t size, char *buf, int read_write)
+grub_usbms_transfer (struct grub_scsi *scsi, grub_size_t cmdsize, char *cmd,
+		     grub_size_t size, char *buf, int read_write)
 {
   struct grub_usbms_cbw cbw;
   grub_usbms_dev_t dev = (grub_usbms_dev_t) scsi->data;
@@ -322,14 +322,14 @@ static grub_err_t
 grub_usbms_read (struct grub_scsi *scsi, grub_size_t cmdsize, char *cmd,
 		 grub_size_t size, char *buf)
 {
-  return grub_usbms_tranfer (scsi, cmdsize, cmd, size, buf, 0);
+  return grub_usbms_transfer (scsi, cmdsize, cmd, size, buf, 0);
 }
 
 static grub_err_t
 grub_usbms_write (struct grub_scsi *scsi, grub_size_t cmdsize, char *cmd,
 		  grub_size_t size, char *buf)
 {
-  return grub_usbms_tranfer (scsi, cmdsize, cmd, size, buf, 1);
+  return grub_usbms_transfer (scsi, cmdsize, cmd, size, buf, 1);
 }
 
 static grub_err_t
diff --git a/efiemu/main.c b/efiemu/main.c
index e11d7c3f9..da5733647 100644
--- a/efiemu/main.c
+++ b/efiemu/main.c
@@ -214,7 +214,7 @@ grub_efiemu_load_file (const char *filename)
       return grub_error (grub_errno, "Couldn't init memory management");
     }
 
-  grub_dprintf ("efiemu", "mm inited\n");
+  grub_dprintf ("efiemu", "mm initialized\n");
 
   err = grub_efiemu_loadcore_init (file);
   if (err)
diff --git a/efiemu/mm.c b/efiemu/mm.c
index e0364e699..e7dcf399e 100644
--- a/efiemu/mm.c
+++ b/efiemu/mm.c
@@ -18,7 +18,7 @@
  */
 /*
   To keep efiemu runtime contiguous this mm is special. 
-  It uses deffered allocation.
+  It uses deferred allocation.
   In the first stage you may request memory with grub_efiemu_request_memalign
   It will give you a handle with which in the second phase you can access your 
   memory with grub_efiemu_mm_obtain_request (handle). It's guaranteed that
@@ -624,7 +624,7 @@ grub_efiemu_mm_do_alloc (void)
   if (!efiemu_mmap)
     {
       grub_efiemu_unload ();
-      return grub_error (GRUB_ERR_OUT_OF_MEMORY, "Couldn't initilaize mmap");
+      return grub_error (GRUB_ERR_OUT_OF_MEMORY, "Couldn't initialize mmap");
     }
 
   if ((err = efiemu_alloc_requests ()))
diff --git a/efiemu/runtime/efiemu.c b/efiemu/runtime/efiemu.c
index 81fb56284..5887c48ab 100644
--- a/efiemu/runtime/efiemu.c
+++ b/efiemu/runtime/efiemu.c
@@ -116,7 +116,7 @@ extern grub_int16_t efiemu_time_zone;
 extern grub_uint8_t efiemu_time_daylight;
 extern grub_uint32_t efiemu_time_accuracy;
 
-/* Some standard functions because we need to be stadalone */
+/* Some standard functions because we need to be standalone */
 static void
 efiemu_memcpy (void *to, void *from, int count)
 {
@@ -251,7 +251,7 @@ EFI_FUNC (efiemu_set_time) (grub_efi_time_t *time)
   return GRUB_EFI_SUCCESS;
 }
 
-/* Folowing 2 functions are vendor specific. So announce it as unsupported */
+/* Following 2 functions are vendor specific. So announce it as unsupported */
 grub_efi_status_t
 EFI_FUNC (efiemu_get_wakeup_time) (grub_efi_boolean_t *enabled,
 				      grub_efi_boolean_t *pending,
diff --git a/font/font.c b/font/font.c
index cfe1ee462..39d61126e 100644
--- a/font/font.c
+++ b/font/font.c
@@ -186,7 +186,7 @@ font_init (grub_font_t font)
 
    On success, the section name is stored in section->name and the length in
    section->length, and 0 is returned.  On failure, 1 is returned and
-   grub_errno is set approriately with an error message.
+   grub_errno is set appropriately with an error message.
 
    If 1 is returned due to being at the end of the file, then section->eof is
    set to 1; otherwise, section->eof is set to 0.  */
diff --git a/fs/hfs.c b/fs/hfs.c
index 283c6bc0f..ef318d481 100644
--- a/fs/hfs.c
+++ b/fs/hfs.c
@@ -124,7 +124,7 @@ struct grub_hfs_extent_key
   grub_uint16_t first_block;
 } __attribute__ ((packed));
 
-/* A dirrect record.  This is used to find out the directory ID.  */
+/* A directory record.  This is used to find out the directory ID.  */
 struct grub_hfs_dirrec
 {
   /* For a directory, type == 1.  */
@@ -744,7 +744,7 @@ grub_hfs_find_node (struct grub_hfs_data *data, char *key,
       else
 	cmp = grub_hfs_cmp_extkeys (rec->key, (void *) key);
       
-      /* If the key is smaller or equal to the currect node, mark the
+      /* If the key is smaller or equal to the current node, mark the
 	 entry.  In case of a non-leaf mode it will be used to lookup
 	 the rest of the tree.  */
       if (cmp <= 0)
diff --git a/fs/reiserfs.c b/fs/reiserfs.c
index 433e89b01..16a9e0483 100644
--- a/fs/reiserfs.c
+++ b/fs/reiserfs.c
@@ -809,7 +809,7 @@ grub_reiserfs_iterate_dir (grub_fshelp_node_t item,
                   grub_uint32_t entry_block_number;
                   /* Order is very important here.
                      First set the offset to 0 using current key version.
-                     Then change the key type, which influes on key version
+                     Then change the key type, which affects key version
                      detection.  */
                   grub_reiserfs_set_key_offset (&entry_key, 0);
                   grub_reiserfs_set_key_type (&entry_key, GRUB_REISERFS_STAT,
diff --git a/fs/udf.c b/fs/udf.c
index abe992e0c..bbad458fc 100644
--- a/fs/udf.c
+++ b/fs/udf.c
@@ -570,7 +570,7 @@ grub_udf_mount (grub_disk_t disk)
     }
 
   data->npd = data->npm = 0;
-  /* Locate Partiton Descriptor (PD) and Logical Volume Descriptor (LVD).  */
+  /* Locate Partition Descriptor (PD) and Logical Volume Descriptor (LVD).  */
   while (1)
     {
       struct grub_udf_tag tag;
diff --git a/include/grub/command.h b/include/grub/command.h
index a391cf2a9..6e9942b60 100644
--- a/include/grub/command.h
+++ b/include/grub/command.h
@@ -67,7 +67,7 @@ struct grub_command
   /* The description of the command.  */
   const char *description;
 
-  /* Arbitary data.  */
+  /* Arbitrary data.  */
   void *data;
 };
 typedef struct grub_command *grub_command_t;
diff --git a/include/grub/efiemu/efiemu.h b/include/grub/efiemu/efiemu.h
index 1515a67df..78373e4e1 100644
--- a/include/grub/efiemu/efiemu.h
+++ b/include/grub/efiemu/efiemu.h
@@ -99,7 +99,7 @@ typedef struct grub_efiemu_runtime_services64 grub_efiemu_runtime_services64_t;
 extern grub_efi_system_table32_t *grub_efiemu_system_table32;
 extern grub_efi_system_table64_t *grub_efiemu_system_table64;
 
-/* Convenience macroses to access currently loaded efiemu */
+/* Convenience macros to access currently loaded efiemu */
 #define grub_efiemu_system_table ((grub_efiemu_sizeof_uintn_t () == 8) \
 				  ? (void *) grub_efiemu_system_table64 \
 				  : (void *) grub_efiemu_system_table32)
diff --git a/include/grub/elf.h b/include/grub/elf.h
index 5d46daa0c..319bc7ce6 100644
--- a/include/grub/elf.h
+++ b/include/grub/elf.h
@@ -206,18 +206,18 @@ typedef struct
 #define EM_68HC12	53		/* Motorola M68HC12 */
 #define EM_MMA		54		/* Fujitsu MMA Multimedia Accelerator*/
 #define EM_PCP		55		/* Siemens PCP */
-#define EM_NCPU		56		/* Sony nCPU embeeded RISC */
+#define EM_NCPU		56		/* Sony nCPU embedded RISC */
 #define EM_NDR1		57		/* Denso NDR1 microprocessor */
 #define EM_STARCORE	58		/* Motorola Start*Core processor */
 #define EM_ME16		59		/* Toyota ME16 processor */
-#define EM_ST100	60		/* STMicroelectronic ST100 processor */
+#define EM_ST100	60		/* STMicroelectronics ST100 processor */
 #define EM_TINYJ	61		/* Advanced Logic Corp. Tinyj emb.fam*/
 #define EM_X86_64	62		/* AMD x86-64 architecture */
 #define EM_PDSP		63		/* Sony DSP Processor */
 
 #define EM_FX66		66		/* Siemens FX66 microcontroller */
 #define EM_ST9PLUS	67		/* STMicroelectronics ST9+ 8/16 mc */
-#define EM_ST7		68		/* STmicroelectronics ST7 8 bit mc */
+#define EM_ST7		68		/* STMicroelectronics ST7 8 bit mc */
 #define EM_68HC16	69		/* Motorola MC68HC16 microcontroller */
 #define EM_68HC11	70		/* Motorola MC68HC11 microcontroller */
 #define EM_68HC08	71		/* Motorola MC68HC08 microcontroller */
@@ -319,7 +319,7 @@ typedef struct
 #define SHT_FINI_ARRAY	  15		/* Array of destructors */
 #define SHT_PREINIT_ARRAY 16		/* Array of pre-constructors */
 #define SHT_GROUP	  17		/* Section group */
-#define SHT_SYMTAB_SHNDX  18		/* Extended section indeces */
+#define SHT_SYMTAB_SHNDX  18		/* Extended section indices */
 #define	SHT_NUM		  19		/* Number of defined types.  */
 #define SHT_LOOS	  0x60000000	/* Start OS-specific */
 #define SHT_GNU_LIBLIST	  0x6ffffff7	/* Prelink library list */
@@ -1191,7 +1191,7 @@ typedef struct
 #define R_SPARC_LM22		36	/* Low middle 22 bits of ... */
 #define R_SPARC_PC_HH22		37	/* Top 22 bits of pc rel 64 bit */
 #define R_SPARC_PC_HM10		38	/* High middle 10 bit of ... */
-#define R_SPARC_PC_LM22		39	/* Low miggle 22 bits of ... */
+#define R_SPARC_PC_LM22		39	/* Low middle 22 bits of ... */
 #define R_SPARC_WDISP16		40	/* PC relative 16 bit shifted */
 #define R_SPARC_WDISP19		41	/* PC relative 19 bit shifted */
 #define R_SPARC_7		43	/* Direct 7 bit */
@@ -1625,9 +1625,9 @@ typedef Elf32_Addr Elf32_Conflict;
 #define EFA_PARISC_1_1		    0x0210 /* PA-RISC 1.1 big-endian.  */
 #define EFA_PARISC_2_0		    0x0214 /* PA-RISC 2.0 big-endian.  */
 
-/* Additional section indeces.  */
+/* Additional section indices.  */
 
-#define SHN_PARISC_ANSI_COMMON	0xff00	   /* Section for tenatively declared
+#define SHN_PARISC_ANSI_COMMON	0xff00	   /* Section for tentatively declared
 					      symbols in ANSI C.  */
 #define SHN_PARISC_HUGE_COMMON	0xff01	   /* Common blocks in huge model.  */
 
@@ -1784,7 +1784,7 @@ typedef Elf32_Addr Elf32_Conflict;
 
 /* Legal values for sh_type field of Elf64_Shdr.  */
 
-/* These two are primerily concerned with ECOFF debugging info.  */
+/* These two are primarily concerned with ECOFF debugging info.  */
 #define SHT_ALPHA_DEBUG		0x70000001
 #define SHT_ALPHA_REGINFO	0x70000002
 
diff --git a/include/grub/lib/LzmaEnc.h b/include/grub/lib/LzmaEnc.h
index c625cd0bc..fc156a448 100644
--- a/include/grub/lib/LzmaEnc.h
+++ b/include/grub/lib/LzmaEnc.h
@@ -60,7 +60,7 @@ UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2);
 Returns:
   SZ_OK           - OK
   SZ_ERROR_MEM    - Memory allocation error
-  SZ_ERROR_PARAM  - Incorrect paramater in props
+  SZ_ERROR_PARAM  - Incorrect parameter in props
   SZ_ERROR_WRITE  - Write callback error.
   SZ_ERROR_PROGRESS - some break from progress callback
   SZ_ERROR_THREAD - errors in multithreading functions (only for Mt version)
@@ -83,7 +83,7 @@ SRes LzmaEnc_MemEncode(CLzmaEncHandle p, Byte *dest, SizeT *destLen, const Byte
 Return code:
   SZ_OK               - OK
   SZ_ERROR_MEM        - Memory allocation error
-  SZ_ERROR_PARAM      - Incorrect paramater
+  SZ_ERROR_PARAM      - Incorrect parameter
   SZ_ERROR_OUTPUT_EOF - output buffer overflow
   SZ_ERROR_THREAD     - errors in multithreading functions (only for Mt version)
 */
diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h
index 188068141..159da6225 100644
--- a/include/grub/script_sh.h
+++ b/include/grub/script_sh.h
@@ -170,7 +170,7 @@ struct grub_parser_param
      function.  */
   struct grub_script_mem *func_mem;
 
-  /* When set to 0, no errors have occured during parsing.  */
+  /* When set to 0, no errors have occurred during parsing.  */
   int err;
 
   /* The memory that was used while parsing and scanning.  */
diff --git a/include/grub/usb.h b/include/grub/usb.h
index 9c9e58bcd..8dd3b6e2e 100644
--- a/include/grub/usb.h
+++ b/include/grub/usb.h
@@ -155,7 +155,7 @@ struct grub_usb_device
   /* Device speed.  */
   grub_usb_speed_t speed;
 
-  /* All desciptors are read if this is set to 1.  */
+  /* All descriptors are read if this is set to 1.  */
   int initialized;
 
   /* Data toggle values (used for bulk transfers only).  */
diff --git a/include/grub/usbdesc.h b/include/grub/usbdesc.h
index 97947dc1b..027e7ed34 100644
--- a/include/grub/usbdesc.h
+++ b/include/grub/usbdesc.h
@@ -62,7 +62,7 @@ struct grub_usb_desc_config
 } __attribute__ ((packed));
 
 #if 0
-struct grub_usb_desc_ifassosiation
+struct grub_usb_desc_if_association
 {
   grub_uint8_t length;
   grub_uint8_t type;
diff --git a/include/grub/xnu.h b/include/grub/xnu.h
index 1462dc850..c6b2e8816 100644
--- a/include/grub/xnu.h
+++ b/include/grub/xnu.h
@@ -27,7 +27,7 @@ struct grub_xnu_hibernate_header
   /* Size of the image. Notice that file containing image is usually bigger. */
   grub_uint64_t image_size;
   grub_uint8_t unknown1[8];
-  /* Where to copy lauchcode?*/
+  /* Where to copy launchcode? */
   grub_uint32_t launchcode_target_page;
   /* How many pages of launchcode? */
   grub_uint32_t launchcode_numpages;
diff --git a/kern/ieee1275/cmain.c b/kern/ieee1275/cmain.c
index b5e2ba66b..741d47f8d 100644
--- a/kern/ieee1275/cmain.c
+++ b/kern/ieee1275/cmain.c
@@ -130,7 +130,7 @@ grub_ieee1275_find_options (void)
 
 	 - SD cards.  These work fine.
 
-	 To avoid brekage, we only need to skip USB probing.  However,
+	 To avoid breakage, we only need to skip USB probing.  However,
 	 since detecting SD cards is more reliable, we do that instead.
       */
 
diff --git a/kern/ieee1275/init.c b/kern/ieee1275/init.c
index 27783cc83..5d5d733d9 100644
--- a/kern/ieee1275/init.c
+++ b/kern/ieee1275/init.c
@@ -150,7 +150,7 @@ static void grub_claim_heap (void)
 
     /* In theory, firmware should already prevent this from happening by not
        listing our own image in /memory/available.  The check below is intended
-       as a safegard in case that doesn't happen.  It does, however, not protect
+       as a safeguard in case that doesn't happen.  However, it doesn't protect
        us from corrupting our module area, which extends up to a
        yet-undetermined region above _end.  */
     if ((addr < (grub_addr_t) _end) && ((addr + len) > (grub_addr_t) _start))
diff --git a/kern/ieee1275/openfw.c b/kern/ieee1275/openfw.c
index 7d6502379..e71256de2 100644
--- a/kern/ieee1275/openfw.c
+++ b/kern/ieee1275/openfw.c
@@ -409,7 +409,7 @@ grub_reboot (void)
 void
 grub_halt (void)
 {
-  /* Not standarized.  We try both known commands.  */
+  /* Not standardized.  We try both known commands.  */
 
   grub_ieee1275_interpret ("shut-down", 0);
   grub_ieee1275_interpret ("power-off", 0);
diff --git a/loader/i386/bsd.c b/loader/i386/bsd.c
index db76399cd..ab3a6353c 100644
--- a/loader/i386/bsd.c
+++ b/loader/i386/bsd.c
@@ -394,7 +394,7 @@ grub_freebsd_list_modules (void)
     }
 }
 
-/* This function would be here but it's under different licence. */
+/* This function would be here but it's under different license. */
 #include "bsd_pagetable.c"
 
 struct gdt_descriptor
diff --git a/loader/i386/bsd_trampoline.S b/loader/i386/bsd_trampoline.S
index f6bfe2c44..577ddb829 100644
--- a/loader/i386/bsd_trampoline.S
+++ b/loader/i386/bsd_trampoline.S
@@ -98,7 +98,7 @@ VARIABLE(grub_bsd64_trampoline_start)
 	orl	$CR0_PG, %eax
 	movl	%eax, %cr0
 
-	/* Now we're in compatability mode. set %cs for long mode.  */
+	/* Now we're in compatibility mode. set %cs for long mode.  */
 	/* lgdt */
 	.byte 0x0f
 	.byte 0x01
diff --git a/loader/macho.c b/loader/macho.c
index da081a27f..ed70caa33 100644
--- a/loader/macho.c
+++ b/loader/macho.c
@@ -121,7 +121,7 @@ grub_macho32_readfile (grub_macho_t macho, void *dest)
   grub_ssize_t read;
   if (! grub_macho_contains_macho32 (macho))
     return grub_error (GRUB_ERR_BAD_OS, 
-		       "Couldn't read arcitecture-specific part");
+		       "Couldn't read architecture-specific part");
 
   if (grub_file_seek (macho->file, macho->offset32) == (grub_off_t) -1)
     {
@@ -136,7 +136,7 @@ grub_macho32_readfile (grub_macho_t macho, void *dest)
     {
       grub_error_push ();
       return grub_error (GRUB_ERR_BAD_OS, 
-			 "Couldn't read arcitecture-specific part");
+			 "Couldn't read architecture-specific part");
     }
   return GRUB_ERR_NONE;
 }
diff --git a/loader/sparc64/ieee1275/linux.c b/loader/sparc64/ieee1275/linux.c
index 86e532f7f..288ee3add 100644
--- a/loader/sparc64/ieee1275/linux.c
+++ b/loader/sparc64/ieee1275/linux.c
@@ -97,7 +97,7 @@ grub_linux_boot (void)
 
   hp = (struct linux_hdrs *) linux_addr;
 
-  /* Any pointer we derefence in the kernel image must be relocated
+  /* Any pointer we dereference in the kernel image must be relocated
      to where we actually loaded the kernel.  */
   addr = (grub_addr_t) hp->bootstr_info;
   addr += (linux_addr - linux_entry);
@@ -474,7 +474,7 @@ fetch_translations (void)
 
   if (grub_ieee1275_get_property (node, "translations", of_trans, actual, &actual))
     {
-      grub_printf ("Cannot fetch /vritual-memory/translations property.\n");
+      grub_printf ("Cannot fetch /virtual-memory/translations property.\n");
       return;
     }
 
diff --git a/loader/xnu.c b/loader/xnu.c
index 45696ee5f..2b6ffa42c 100644
--- a/loader/xnu.c
+++ b/loader/xnu.c
@@ -1053,7 +1053,7 @@ grub_xnu_scan_dir_for_kexts (char *dirname, char *osbundlerequired,
   return GRUB_ERR_NONE;
 }
 
-/* Load extension DIRNAME. (extensions are directoris in xnu) */
+/* Load extension DIRNAME. (extensions are directories in xnu) */
 grub_err_t
 grub_xnu_load_kext_from_dir (char *dirname, char *osbundlerequired, 
 			     int maxrecursion)
@@ -1226,7 +1226,7 @@ grub_cmd_xnu_kext (grub_command_t cmd __attribute__ ((unused)),
   grub_file_t binfile = 0;
   if (argc == 2)
     {
-      /* User explicitely specified plist and binary. */
+      /* User explicitly specified plist and binary. */
       if (grub_strcmp (args[1], "-") != 0)
 	{
 	  binfile = grub_gzfile_open (args[1], 1);
diff --git a/mmap/i386/uppermem.c b/mmap/i386/uppermem.c
index 80576cad9..5f6eece0e 100644
--- a/mmap/i386/uppermem.c
+++ b/mmap/i386/uppermem.c
@@ -63,7 +63,7 @@ grub_mmap_get_upper (void)
   return upper;
 }
 
-/* Count the continous bytes after 64 MiB. */
+/* Count the continuous bytes after 64 MiB. */
 grub_uint64_t 
 grub_mmap_get_post64 (void)
 {
diff --git a/mmap/mmap.c b/mmap/mmap.c
index 86df28b1d..67f7c7b0b 100644
--- a/mmap/mmap.c
+++ b/mmap/mmap.c
@@ -212,7 +212,7 @@ grub_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t,
 	if (present[k] && (curtype == -1 || priority[k] > priority[curtype]))
 	  curtype = k;
 
-      /* Anounce region to the hook if necessary. */
+      /* Announce region to the hook if necessary. */
       if ((curtype == -1 || curtype != lasttype) 
 	  && lastaddr != scanline_events[i].pos
 	  && lasttype != -1
diff --git a/normal/datetime.c b/normal/datetime.c
index 272b716fa..9e667b79c 100644
--- a/normal/datetime.c
+++ b/normal/datetime.c
@@ -64,7 +64,7 @@ grub_unixtime2datetime (grub_int32_t nix, struct grub_datetime *datetime)
   /* In the period of validity of unixtime all years divisible by 4 
      are bissextile*/
   /* Convenience: let's have 3 consecutive non-bissextile years 
-     at the begining of the epoch. So count from 1973 instead of 1970 */
+     at the beginning of the epoch. So count from 1973 instead of 1970 */
   nix -= 3*SECPERYEAR + SECPERDAY;
   /* Transform C divisions and modulos to mathematical ones */
   div = nix / SECPER4YEARS;
@@ -73,8 +73,8 @@ grub_unixtime2datetime (grub_int32_t nix, struct grub_datetime *datetime)
   datetime->year = 1973 + 4 * div;
   nix -= div * SECPER4YEARS;
 
-  /* On 31st december of bissextile years 365 days from the begining 
-     of the year elapsed but year isn't finished yet*/
+  /* On 31st December of bissextile years 365 days from the beginning
+     of the year elapsed but year isn't finished yet */
   if (nix / SECPERYEAR == 4)
     {
       datetime->year += 3;
diff --git a/normal/main.c b/normal/main.c
index 1c2eff4df..bc0808b02 100644
--- a/normal/main.c
+++ b/normal/main.c
@@ -390,8 +390,8 @@ grub_normal_init_page (void)
 
 static int reader_nested;
 
-/* Read the config file COFIG, and execute the menu interface or
-   the command-line interface if BATCH is false.  */
+/* Read the config file CONFIG and execute the menu interface or
+   the command line interface if BATCH is false.  */
 void
 grub_normal_execute (const char *config, int nested, int batch)
 {
diff --git a/normal/menu.c b/normal/menu.c
index e1d7edcad..59ad83fa7 100644
--- a/normal/menu.c
+++ b/normal/menu.c
@@ -83,7 +83,7 @@ grub_menu_set_timeout (int timeout)
 }
 
 /* Get the first entry number from the value of the environment variable NAME,
-   which is a space-separated list of nonnegative integers.  The entry number
+   which is a space-separated list of non-negative integers.  The entry number
    which is returned is stripped from the value of NAME.  If no entry number
    can be found, -1 is returned.  */
 static int
diff --git a/partmap/apple.c b/partmap/apple.c
index d6ddc0b3f..2902f27d2 100644
--- a/partmap/apple.c
+++ b/partmap/apple.c
@@ -77,7 +77,7 @@ struct grub_apple_part
   /* Reserved.  */
   grub_uint32_t reserved2;
   
-  /* The entrypoint of the bootcode.  */
+  /* The entry point of the bootcode.  */
   grub_uint32_t bootcode_entrypoint;
 
   /* Reserved.  */
diff --git a/term/i386/pc/vesafb.c b/term/i386/pc/vesafb.c
index edd0b1a63..884842895 100644
--- a/term/i386/pc/vesafb.c
+++ b/term/i386/pc/vesafb.c
@@ -83,7 +83,7 @@ struct grub_virtual_screen
   struct grub_colored_char *text_buffer;
 };
 
-/* Make seure text buffer is not marked as allocated.  */
+/* Make sure text buffer is not marked as allocated.  */
 static struct grub_virtual_screen virtual_screen =
   {
     .text_buffer = 0
diff --git a/term/usb_keyboard.c b/term/usb_keyboard.c
index 4a5d75bcf..66962d8e5 100644
--- a/term/usb_keyboard.c
+++ b/term/usb_keyboard.c
@@ -92,7 +92,7 @@ grub_usb_hid (void)
   /* Place the device in boot mode.  */
   grub_usb_control_msg (usbdev, 0x21, 0x0B, 0, 0, 0, 0);
 
-  /* Reports everytime an event occurs and not more often than that.  */
+  /* Reports every time an event occurs and not more often than that.  */
   grub_usb_control_msg (usbdev, 0x21, 0x0A, 0<<8, 0, 0, 0);
 }
 
diff --git a/util/getroot.c b/util/getroot.c
index 68e1fad58..b6aae392f 100644
--- a/util/getroot.c
+++ b/util/getroot.c
@@ -351,7 +351,7 @@ find_cygwin_root_device (const char *path, dev_t dev)
   /* Cygwin returns the partition serial number in stat.st_dev.
      This is never identical to the device number of the emulated
      /dev/sdXN device, so above find_root_device () does not work.
-     Search the partion with the same serial in boot sector instead.  */
+     Search the partition with the same serial in boot sector instead.  */
   char devpath[sizeof ("/dev/sda15") + 13]; /* Size + Paranoia.  */
   int d;
   for (d = 'a'; d <= 'z'; d++)
diff --git a/util/resolve.c b/util/resolve.c
index 85aec72e9..c79f3c104 100644
--- a/util/resolve.c
+++ b/util/resolve.c
@@ -101,7 +101,7 @@ read_dep_list (FILE *fp)
 	  struct mod_list *mod;
 	  char *name;
 
-	  /* Skip white spaces.  */
+	  /* Skip whitespace.  */
 	  while (*p && isspace (*p))
 	    p++;
 
@@ -110,7 +110,7 @@ read_dep_list (FILE *fp)
 
 	  name = p;
 
-	  /* Skip non-WSPs.  */
+	  /* Skip non-whitespace.  */
 	  while (*p && ! isspace (*p))
 	    p++;
 
diff --git a/video/i386/pc/vbe.c b/video/i386/pc/vbe.c
index 23f7d46f0..ae0840234 100644
--- a/video/i386/pc/vbe.c
+++ b/video/i386/pc/vbe.c
@@ -42,7 +42,7 @@ static struct grub_vbe_palette_data vga_colors[16] =
     {0x00, 0x00, 0xA8, 0x00}, // 4 = red
     {0xA8, 0x00, 0xA8, 0x00}, // 5 = magenta
     {0x00, 0x54, 0xA8, 0x00}, // 6 = brown
-    {0xA8, 0xA8, 0xA8, 0x00}, // 7 = ligth gray
+    {0xA8, 0xA8, 0xA8, 0x00}, // 7 = light gray
 
     {0x54, 0x54, 0x54, 0x00}, // 8 = dark gray
     {0xFE, 0x54, 0x54, 0x00}, // 9 = bright blue
@@ -1552,7 +1552,7 @@ grub_video_vbe_delete_render_target (struct grub_video_render_target *target)
   if (! target)
     return GRUB_ERR_NONE;
 
-  /* TODO: Delist render target fron render target list.  */
+  /* TODO: Delist render target from render target list.  */
 
   /* If this is software render target, free it's memory.  */
   if (target->is_allocated)
diff --git a/video/readers/png.c b/video/readers/png.c
index f9247b1c8..dffcd8524 100644
--- a/video/readers/png.c
+++ b/video/readers/png.c
@@ -109,7 +109,7 @@ struct grub_png_data
 
   grub_uint8_t *cur_rgb;
 
-  int cur_colume, cur_filter, first_line;
+  int cur_column, cur_filter, first_line;
 };
 
 static grub_uint32_t
@@ -265,7 +265,7 @@ grub_png_decode_image_header (struct grub_png_data *data)
 
   data->raw_bytes = data->image_height * (data->image_width + 1) * data->bpp;
 
-  data->cur_colume = 0;
+  data->cur_column = 0;
   data->first_line = 1;
 
   if (grub_png_get_byte (data) != PNG_COMPRESSION_BASE)
@@ -522,7 +522,7 @@ grub_png_output_byte (struct grub_png_data *data, grub_uint8_t n)
   if (--data->raw_bytes < 0)
     return grub_error (GRUB_ERR_BAD_FILE_TYPE, "image size overflown");
 
-  if (data->cur_colume == 0)
+  if (data->cur_column == 0)
     {
       if (n >= PNG_FILTER_VALUE_LAST)
 	return grub_error (GRUB_ERR_BAD_FILE_TYPE, "invalid filter value");
@@ -532,9 +532,9 @@ grub_png_output_byte (struct grub_png_data *data, grub_uint8_t n)
   else
     *(data->cur_rgb++) = n;
 
-  data->cur_colume++;
+  data->cur_column++;
   row_bytes = data->image_width * data->bpp;
-  if (data->cur_colume == row_bytes + 1)
+  if (data->cur_column == row_bytes + 1)
     {
       grub_uint8_t *blank_line = NULL;
       grub_uint8_t *cur = data->cur_rgb - row_bytes;
@@ -623,7 +623,7 @@ grub_png_output_byte (struct grub_png_data *data, grub_uint8_t n)
       if (blank_line)
 	grub_free (blank_line);
 
-      data->cur_colume = 0;
+      data->cur_column = 0;
       data->first_line = 0;
     }