diff --git a/ChangeLog b/ChangeLog
index 416894e..38362a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 Version 0.9.9
 =============
 2003-06-21: fix1
+- the last bomb who explode from a player won't anymore be
+  used right away. We only use it if there is no other bomb
+  free.
+
+- bfield fixed on incoming bombdata packets
+
 - network packet timeout set down to 400ms
 
 - screen clipping of gfx_AddUpdateRect
@@ -11,7 +17,6 @@ Version 0.9.9
 
 
 2003-06-12
-
 - PowerUps will be painted diffrent now. Depend
   on what it is.
 
diff --git a/src/packets.c b/src/packets.c
index d7ab181..88d5263 100644
--- a/src/packets.c
+++ b/src/packets.c
@@ -617,8 +617,12 @@ do_bombdata (struct pkg_bombdata *b_dat, _net_addr * addr)
 
     bomb->pos.x = b_dat->x;
     bomb->pos.y = b_dat->y;
-    bomb->to = b_dat->to;
-		
+	
+	if (bomb->state != b_dat->state && bomb->state != BS_ticking)
+		bomb->to = b_dat->to;  /* only set if the bomb isn't already ticking
+							      to make sure the timeout won't be resetted
+								  by an old network packet */
+	
 	bman.bfield[bomb->pos.x >> 8][bomb->pos.y >> 8] = 1; // keep the bfield up to date
 
     bomb->r = b_dat->r;