diff --git a/ChangeLog b/ChangeLog
index 6d927f55..0a556147 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,57 @@
 
 	* Release 0.5.0
 
+	To fix GCC3 compilation issue:
+
+	* src/CancelMessage.h
+	(ID): Renamed as ID_t
+	(ID_t): New enum.
+	* src/RejectMessage.h
+	(ID): Renamed as ID_t
+	(ID_t): New enum.
+	* src/SuggestPieceMessage.h
+	(ID): Renamed as ID_t
+	(ID_t): New enum.
+	* src/AllowedFastMessage.h
+	(ID): Renamed as ID_t
+	(ID_t): New enum.
+	* src/PortMessage.h
+	(ID): Renamed as ID_t
+	(ID_t): New enum.
+	* src/HaveNoneMessage.h
+	(ID): Renamed as ID_t
+	(ID_t): New enum.
+	* src/KeepAliveMessage.h
+	(ID): Renamed as ID_t
+	(ID_t): New enum.
+	* src/HaveAllMessage.h
+	(ID): Renamed as ID_t
+	(ID_t): New enum.
+	* src/UnchokeMessage.h
+	(ID): Renamed as ID_t
+	(ID_t): New enum.
+	* src/BitfieldMessage.h
+	(ID): Renamed as ID_t
+	(ID_t): New enum.
+	* src/PieceMessage.h
+	(ID): Renamed as ID_t
+	(ID_t): New enum.
+	* src/RequestMessage.h
+	(ID): Renamed as ID_t
+	(ID_t): New enum.
+	* src/NotInterestedMessage.h
+	(ID): Renamed as ID_t
+	(ID_t): New enum.
+	* src/ChokeMessage.h
+	(ID): Renamed as ID_t
+	(ID_t): New enum.
+	* src/InterestedMessage.h
+	(ID): Renamed as ID_t
+	(ID_t): New enum.
+	* src/HaveMessage.h
+	(ID): Renamed as ID_t
+	(ID_t): New enum.
+	
 2006-05-26  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
 
 	* src/PeerAbstractCommand.h
diff --git a/src/AllowedFastMessage.h b/src/AllowedFastMessage.h
index 0d4f1666..f25d02ed 100644
--- a/src/AllowedFastMessage.h
+++ b/src/AllowedFastMessage.h
@@ -37,7 +37,7 @@ public:
 
   virtual ~AllowedFastMessage() {}
 
-  enum ID {
+  enum ID_t {
     ID = 17
   };
 
diff --git a/src/BitfieldMessage.h b/src/BitfieldMessage.h
index 3fd19c0d..af33ba55 100644
--- a/src/BitfieldMessage.h
+++ b/src/BitfieldMessage.h
@@ -47,7 +47,7 @@ public:
     }
   }
 
-  enum ID {
+  enum ID_t {
     ID = 5
   };
 
diff --git a/src/CancelMessage.h b/src/CancelMessage.h
index a75ae2eb..fc1dea7e 100644
--- a/src/CancelMessage.h
+++ b/src/CancelMessage.h
@@ -42,7 +42,7 @@ public:
 
   virtual ~CancelMessage() {}
 
-  enum ID {
+  enum ID_t {
     ID = 8
   };
 
diff --git a/src/ChokeMessage.h b/src/ChokeMessage.h
index 1fe0dc3e..46adc34e 100644
--- a/src/ChokeMessage.h
+++ b/src/ChokeMessage.h
@@ -34,7 +34,7 @@ public:
   ChokeMessage():SimplePeerMessage() {}
   virtual ~ChokeMessage() {}
 
-  enum ID {
+  enum ID_t {
     ID = 0
   };
 
diff --git a/src/HaveAllMessage.h b/src/HaveAllMessage.h
index c9723f70..68156864 100644
--- a/src/HaveAllMessage.h
+++ b/src/HaveAllMessage.h
@@ -31,7 +31,7 @@ public:
   HaveAllMessage();
   virtual ~HaveAllMessage();
 
-  enum ID {
+  enum ID_t {
     ID = 14
   };
 
diff --git a/src/HaveMessage.h b/src/HaveMessage.h
index 593e8d7b..906ec9fe 100644
--- a/src/HaveMessage.h
+++ b/src/HaveMessage.h
@@ -37,7 +37,7 @@ public:
 
   virtual ~HaveMessage() {}
 
-  enum ID {
+  enum ID_t {
     ID = 4
   };
 
diff --git a/src/HaveNoneMessage.h b/src/HaveNoneMessage.h
index 2e05ae4e..b10c6a4c 100644
--- a/src/HaveNoneMessage.h
+++ b/src/HaveNoneMessage.h
@@ -31,7 +31,7 @@ public:
   HaveNoneMessage();
   virtual ~HaveNoneMessage();
   
-  enum ID {
+  enum ID_t {
     ID = 15
   };
   
diff --git a/src/InterestedMessage.h b/src/InterestedMessage.h
index ce93bb18..5ce0a28c 100644
--- a/src/InterestedMessage.h
+++ b/src/InterestedMessage.h
@@ -34,7 +34,7 @@ public:
   InterestedMessage():SimplePeerMessage() {}
   virtual ~InterestedMessage() {}
 
-  enum ID {
+  enum ID_t {
     ID = 2
   };
 
diff --git a/src/KeepAliveMessage.h b/src/KeepAliveMessage.h
index 77c73233..b1a2e24a 100644
--- a/src/KeepAliveMessage.h
+++ b/src/KeepAliveMessage.h
@@ -31,7 +31,7 @@ public:
   KeepAliveMessage():SimplePeerMessage() {}
   virtual ~KeepAliveMessage() {}
 
-  enum ID {
+  enum ID_t {
     ID = 99
   };
 
diff --git a/src/NotInterestedMessage.h b/src/NotInterestedMessage.h
index ac4e2d7e..ead48b59 100644
--- a/src/NotInterestedMessage.h
+++ b/src/NotInterestedMessage.h
@@ -34,7 +34,7 @@ public:
   NotInterestedMessage():SimplePeerMessage() {}
   virtual ~NotInterestedMessage() {}
 
-  enum ID {
+  enum ID_t {
     ID = 3
   };
 
diff --git a/src/PieceMessage.h b/src/PieceMessage.h
index 9f7652e6..54c13148 100644
--- a/src/PieceMessage.h
+++ b/src/PieceMessage.h
@@ -58,7 +58,7 @@ public:
     }
   }
 
-  enum ID {
+  enum ID_t {
     ID = 7
   };
 
diff --git a/src/PortMessage.h b/src/PortMessage.h
index e62e187a..2fa9de8d 100644
--- a/src/PortMessage.h
+++ b/src/PortMessage.h
@@ -31,7 +31,7 @@ public:
   PortMessage():PeerMessage() {}
   virtual ~PortMessage() {}
 
-  enum ID {
+  enum ID_t {
     ID = 9
   };
 
diff --git a/src/RejectMessage.h b/src/RejectMessage.h
index bbb0355d..59a06072 100644
--- a/src/RejectMessage.h
+++ b/src/RejectMessage.h
@@ -42,7 +42,7 @@ public:
 
   virtual ~RejectMessage() {}
 
-  enum ID {
+  enum ID_t {
     ID = 16
   };
 
diff --git a/src/RequestMessage.h b/src/RequestMessage.h
index b84963cf..40aae99c 100644
--- a/src/RequestMessage.h
+++ b/src/RequestMessage.h
@@ -42,7 +42,7 @@ public:
 		   pieces(0), pieceLength(0) {}
   virtual ~RequestMessage() {}
 
-  enum ID {
+  enum ID_t {
     ID = 6
   };
 
diff --git a/src/SuggestPieceMessage.h b/src/SuggestPieceMessage.h
index fa91f39d..fc56b76d 100644
--- a/src/SuggestPieceMessage.h
+++ b/src/SuggestPieceMessage.h
@@ -35,7 +35,7 @@ public:
 
   virtual ~SuggestPieceMessage() {}
 
-  enum ID {
+  enum ID_t {
     ID = 13
   };
 
diff --git a/src/UnchokeMessage.h b/src/UnchokeMessage.h
index 6c40c577..14f80807 100644
--- a/src/UnchokeMessage.h
+++ b/src/UnchokeMessage.h
@@ -34,7 +34,7 @@ public:
   UnchokeMessage():SimplePeerMessage() {}
   virtual ~UnchokeMessage() {}
 
-  enum ID {
+  enum ID_t {
     ID = 1
   };