diff --git a/source/src/server.h b/source/src/server.h
index 07530d16..59429de3 100644
--- a/source/src/server.h
+++ b/source/src/server.h
@@ -442,7 +442,7 @@ guninfo guns[NUMGUNS] =
     { "subgun",     S_SUBGUN,     S_RSUBGUN,  1650,   80,     15,     0,   0, 40,   15,   30,   1,  2,    4,  15,     40,     175,  1,      true },
     { "sniper",     S_SNIPER,     S_RSNIPER,  1950,   1500,   80,     0,   0, 60,   50,   5,    4,  4,    10, 85,     85,     100,  1,      false },
     { "assault",    S_ASSAULT,    S_RASSAULT, 2000,   120,    24,     0,   0, 20,   40,   20,   0,  2,    2,  18,     50,     125,  1,      true },
-    { "cpistol",    S_PISTOL,     S_RPISTOL,  1400,   80,     19,     0,   0, 35,   10,   15,   6,  5,    6,  35,     58,     125,  1,      false },   // temporary
+    { "cpistol",    S_PISTOL,     S_RPISTOL,  1400,   120,    19,     0,   0, 35,   10,   15,   6,  5,    6,  35,     58,     125,  1,      false },   // temporary
     { "grenade",    S_NULL,       S_NULL,     1000,   650,    200,    20,  6,  1,    1,   1,    3,  1,    0,  0,      0,      0,    3,      false },
     { "pistol",     S_PISTOL,     S_RAKIMBO,  1400,   80,     19,     0,   0, 45,   10,   16,   6,  5,    8,  10,     18,     150,  1,      true },
 };
diff --git a/source/src/weapon.cpp b/source/src/weapon.cpp
index a1de5146..4e8fb7a8 100644
--- a/source/src/weapon.cpp
+++ b/source/src/weapon.cpp
@@ -1220,6 +1220,10 @@ bool cpistol::attack(vec &targ) // modded from gun::attack // FIXME
         gunwait = 500;
         shots = 0;
     }
+    else if ( bursting )
+    {
+        gunwait = 80;
+    }
     else
     {
         gunwait = info.attackdelay;