diff --git a/MCGalaxy/Commands/Chat/CmdAfk.cs b/MCGalaxy/Commands/Chat/CmdAfk.cs
index 65ebdf148..f014b7f16 100644
--- a/MCGalaxy/Commands/Chat/CmdAfk.cs
+++ b/MCGalaxy/Commands/Chat/CmdAfk.cs
@@ -42,6 +42,7 @@ namespace MCGalaxy.Commands.Chatting {
                     p.CheckForMessageSpam();
                 }
                 p.AFKCooldown = DateTime.UtcNow.AddSeconds(2);
+                OnPlayerActionEvent.Call(p, PlayerAction.AFK, null, cantSend);
             } else {
                 if (cantSend) {
                     Player.Message(p, "You are no longer marked as being AFK.");
@@ -49,6 +50,7 @@ namespace MCGalaxy.Commands.Chatting {
                     ShowMessage(p, "-λNICK%S- is no longer AFK");
                     p.CheckForMessageSpam();
                 }
+            	OnPlayerActionEvent.Call(p, PlayerAction.UnAFK, null, cantSend);
             }
         }
         
diff --git a/MCGalaxy/Events/PlayerEvents.cs b/MCGalaxy/Events/PlayerEvents.cs
index d5509b1e6..9a308d5e5 100644
--- a/MCGalaxy/Events/PlayerEvents.cs
+++ b/MCGalaxy/Events/PlayerEvents.cs
@@ -19,7 +19,7 @@ using System;
 using BlockID = System.UInt16;
 
 namespace MCGalaxy.Events.PlayerEvents {
-    public enum PlayerAction { Me, Referee, UnReferee };
+    public enum PlayerAction { Me, Referee, UnReferee, AFK, UnAFK };
     public enum MouseButton { Left, Right, Middle }  
     public enum MouseAction { Pressed, Released }
     public enum TargetBlockFace { AwayX, TowardsX, AwayY, TowardsY, AwayZ, TowardsZ, None }
diff --git a/MCGalaxy/Games/CTF/CTFGame.DB.cs b/MCGalaxy/Games/CTF/CtfGame_.DB.cs
similarity index 100%
rename from MCGalaxy/Games/CTF/CTFGame.DB.cs
rename to MCGalaxy/Games/CTF/CtfGame_.DB.cs