diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 45a83e0e56..e581f70431 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-30  Vladimir Prus  <ghost@cs.msu.su>
+
+	* remote.c (watchpoint_to_Z_packet): Use values of Z_packet_type enum
+	instead of hardcoded integer literals.
+
 2006-03-30  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* cli/cli-script.c (insert_args): Handle NULL user_args.
diff --git a/gdb/remote.c b/gdb/remote.c
index bbbf0e1073..efff972fbc 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -4461,13 +4461,13 @@ watchpoint_to_Z_packet (int type)
   switch (type)
     {
     case hw_write:
-      return 2;
+      return Z_PACKET_WRITE_WP;
       break;
     case hw_read:
-      return 3;
+      return Z_PACKET_READ_WP;
       break;
     case hw_access:
-      return 4;
+      return Z_PACKET_ACCESS_WP;
       break;
     default:
       internal_error (__FILE__, __LINE__,