diff --git a/source/src/server.h b/source/src/server.h
index 59429de3..856b8974 100644
--- a/source/src/server.h
+++ b/source/src/server.h
@@ -421,7 +421,7 @@ itemstat ammostats[NUMGUNS] =
     {60, 90,  90,  S_ITEMAMMO},   //subgun
     {10, 20,  15,  S_ITEMAMMO},   //sniper
     {40, 60,  60,  S_ITEMAMMO},   //assault
-    {30, 30,  75,  S_ITEMAMMO},   //cpistol
+    {30, 45,  75,  S_ITEMAMMO},   //cpistol
     {1,  0,   3,   S_ITEMAMMO},   //grenade
     {72, 0,   72,  S_ITEMAKIMBO}  //akimbo
 };
diff --git a/source/src/weapon.cpp b/source/src/weapon.cpp
index 4e8fb7a8..75e6345b 100644
--- a/source/src/weapon.cpp
+++ b/source/src/weapon.cpp
@@ -1156,23 +1156,6 @@ bool cpistol::reload()
     if(owner==player1 && r) { bursting = false; }
     return r;
 }
-void cpistol::setburst(bool enable)
-{
-    if(this == owner->weaponsel && !reloading && owner->state == CS_ALIVE)
-    {
-        bursting = enable;
-    }
-}
-
-void setburst(bool enable)
-{
-    if(player1->weaponsel->type != GUN_CPISTOL) return;
-    if(intermission) return;
-    cpistol *cp = (cpistol *)player1->weaponsel;
-    cp->setburst(enable);
-}
-
-COMMAND(setburst, ARG_DOWN);
 
 bool cpistol::attack(vec &targ) // modded from gun::attack // FIXME
 {
@@ -1234,6 +1217,25 @@ bool cpistol::attack(vec &targ) // modded from gun::attack // FIXME
     return true;
 }
 
+void cpistol::setburst(bool enable)
+{
+    if(this == owner->weaponsel && !reloading && owner->state == CS_ALIVE)
+    {
+        bursting = enable;
+    }
+}
+
+void setburst(bool enable)
+{
+    if(player1->weaponsel->type != GUN_CPISTOL) return;
+    if(intermission) return;
+    cpistol *cp = (cpistol *)player1->weaponsel;
+    cp->setburst(enable);
+    attack(enable);
+}
+
+COMMAND(setburst, ARG_DOWN);
+
 // pistol
 
 pistol::pistol(playerent *owner) : gun(owner, GUN_PISTOL) {}