diff --git a/ChangeLog b/ChangeLog
index 7d16e538d..699ba7ec3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2012-02-27  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Replace grub_target_addr with more appropriate types.
+
+	* grub-core/commands/efi/fixvideo.c (scan_card): Replace
+	grub_target_addr with grub_addr.
+	* grub-core/commands/iorw.c (grub_cmd_read): Replace
+	grub_target_addr with grub_port.
+	(grub_cmd_write): Likewise.
+	* grub-core/commands/memrw.c (grub_cmd_read): Replace
+	grub_target_addr with grub_addr.
+	(grub_cmd_write): Likewise.
+	* grub-core/video/efi_uga.c (find_line_len): Likewise.
+
 2012-02-27  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* include/grub/efi/api.h (grub_efi_runtime_services): Add missing
diff --git a/grub-core/commands/efi/fixvideo.c b/grub-core/commands/efi/fixvideo.c
index a58c27916..3ed40b386 100644
--- a/grub-core/commands/efi/fixvideo.c
+++ b/grub-core/commands/efi/fixvideo.c
@@ -54,7 +54,7 @@ scan_card (grub_pci_device_t dev, grub_pci_id_t pciid)
 	{
 	  if (p->pci_id == pciid)
 	    {
-	      grub_target_addr_t base;
+	      grub_addr_t base;
 
 	      grub_dprintf ("fixvideo", "Found graphic card: %s\n", p->name);
 	      addr += 8 + p->mmio_bar * 4;
diff --git a/grub-core/commands/iorw.c b/grub-core/commands/iorw.c
index 2a06e976d..a0c164e54 100644
--- a/grub-core/commands/iorw.c
+++ b/grub-core/commands/iorw.c
@@ -40,7 +40,7 @@ static const struct grub_arg_option options[] =
 static grub_err_t
 grub_cmd_read (grub_extcmd_context_t ctxt, int argc, char **argv)
 {
-  grub_target_addr_t addr;
+  grub_port_t addr;
   grub_uint32_t value = 0;
 
   if (argc != 1)
@@ -77,7 +77,7 @@ grub_cmd_read (grub_extcmd_context_t ctxt, int argc, char **argv)
 static grub_err_t
 grub_cmd_write (grub_command_t cmd, int argc, char **argv)
 {
-  grub_target_addr_t addr;
+  grub_port_t addr;
   grub_uint32_t value;
   grub_uint32_t mask = 0xffffffff;
 
diff --git a/grub-core/commands/memrw.c b/grub-core/commands/memrw.c
index db2e435f2..98769eadb 100644
--- a/grub-core/commands/memrw.c
+++ b/grub-core/commands/memrw.c
@@ -39,7 +39,7 @@ static const struct grub_arg_option options[] =
 static grub_err_t
 grub_cmd_read (grub_extcmd_context_t ctxt, int argc, char **argv)
 {
-  grub_target_addr_t addr;
+  grub_addr_t addr;
   grub_uint32_t value = 0;
   char buf[sizeof ("XXXXXXXX")];
 
@@ -76,7 +76,7 @@ grub_cmd_read (grub_extcmd_context_t ctxt, int argc, char **argv)
 static grub_err_t
 grub_cmd_write (grub_command_t cmd, int argc, char **argv)
 {
-  grub_target_addr_t addr;
+  grub_addr_t addr;
   grub_uint32_t value;
   grub_uint32_t mask = 0xffffffff;
 
diff --git a/grub-core/video/efi_uga.c b/grub-core/video/efi_uga.c
index 1e709a52d..016adbbdd 100644
--- a/grub-core/video/efi_uga.c
+++ b/grub-core/video/efi_uga.c
@@ -54,7 +54,7 @@ static struct
 static int
 find_line_len (grub_uint32_t *fb_base, grub_uint32_t *line_len)
 {
-  grub_uint32_t *base = (grub_uint32_t *) (grub_target_addr_t) *fb_base;
+  grub_uint32_t *base = (grub_uint32_t *) (grub_addr_t) *fb_base;
   int i;
 
   for (i = 0; i < FBTEST_COUNT; i++, base += FBTEST_STEP)
@@ -67,7 +67,7 @@ find_line_len (grub_uint32_t *fb_base, grub_uint32_t *line_len)
 	    {
 	      if ((base[j] & RGB_MASK) == RGB_MAGIC)
 		{
-		  *fb_base = (grub_uint32_t) (grub_target_addr_t) base;
+		  *fb_base = (grub_uint32_t) (grub_addr_t) base;
 		  *line_len = j << 2;
 
 		  return 1;
@@ -223,7 +223,7 @@ grub_video_uga_setup (unsigned int width, unsigned int height,
 	framebuffer.mode_info.width = w;
 	framebuffer.mode_info.height = h;
 	framebuffer.mode_info.pitch = uga_pitch;
-	framebuffer.ptr = (grub_uint8_t *) (grub_target_addr_t) uga_fb;
+	framebuffer.ptr = (grub_uint8_t *) (grub_addr_t) uga_fb;
 
 	found = 1;
       }