diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 00b928c588c..4f0725fa25d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-04  Vladimir Prus  <vladimir@codesourcery.com>
+
+	Implement -target-attach.
+        * mi/mi-cmds.c (mi_cmds): Forward -target-attach to CLI attach.
+
 2008-06-21  Hui Zhu  <teawater@gmail.com>
 
 	* target-descriptions.c (maint_print_c_tdesc_cmd): Fix a memory leak.
diff --git a/gdb/mi/mi-cmds.c b/gdb/mi/mi-cmds.c
index bf7388ac1a1..3ae4c95b00b 100644
--- a/gdb/mi/mi-cmds.c
+++ b/gdb/mi/mi-cmds.c
@@ -117,7 +117,7 @@ struct mi_cmd mi_cmds[] =
   { "symbol-list-variables", { NULL, 0 },  NULL },
   { "symbol-locate", { NULL, 0 }, NULL },
   { "symbol-type", { NULL, 0 }, NULL },
-  { "target-attach", { NULL, 0 }, NULL },
+  { "target-attach", { "attach", 1 }, NULL },
   { "target-compare-sections", { NULL, 0 }, NULL },
   { "target-detach", { "detach", 0 }, 0 },
   { "target-disconnect", { "disconnect", 0 }, 0 },