diff --git a/source/src/entity.h b/source/src/entity.h
index 3da0795d..4a81553c 100644
--- a/source/src/entity.h
+++ b/source/src/entity.h
@@ -316,7 +316,7 @@ public:
 
         if(!m_nopistol)
         {
-            ammo[GUN_PISTOL] = ammostats[GUN_PISTOL].max-magsize(GUN_PISTOL);
+            ammo[GUN_PISTOL] = ammostats[GUN_PISTOL].start-magsize(GUN_PISTOL);//ammostats[GUN_PISTOL].max-magsize(GUN_PISTOL);
             mag[GUN_PISTOL] = magsize(GUN_PISTOL);
         }
 
diff --git a/source/src/server.h b/source/src/server.h
index dd463d30..1586722b 100644
--- a/source/src/server.h
+++ b/source/src/server.h
@@ -451,16 +451,16 @@ const char *entnames[MAXENTTYPES] =
 
 itemstat ammostats[NUMGUNS] =
 {
-    {1,   1,   1,  S_ITEMAMMO  },   // knife dummy
-    {20, 80, 100,  S_ITEMAMMO  },   // pistol : CHANGED since 1.1.0.4 2010nov19
-    {15, 30,  30,  S_ITEMAMMO  },   // rifle
-    {14, 28,  21,  S_ITEMAMMO  },   // shotgun
-    {60, 90,  90,  S_ITEMAMMO  },   // subgun
-    {10, 20,  15,  S_ITEMAMMO  },   // sniper
-    {40, 60,  60,  S_ITEMAMMO  },   // assault
-    {30, 45,  75,  S_ITEMAMMO  },   // cpistol
-    { 1,  0,   3,  S_ITEMAMMO  },   // grenade
-    {72,  0,  72,  S_ITEMAKIMBO}    // akimbo
+    {  1,  1,   1,  S_ITEMAMMO  },   // knife dummy
+    { 20, 60, 100,  S_ITEMAMMO  },   // pistol : CHANGED since 1.1.0.4 2010nov19
+    { 15, 30,  30,  S_ITEMAMMO  },   // rifle
+    { 14, 28,  21,  S_ITEMAMMO  },   // shotgun
+    { 60, 90,  90,  S_ITEMAMMO  },   // subgun
+    { 10, 20,  15,  S_ITEMAMMO  },   // sniper
+    { 40, 60,  60,  S_ITEMAMMO  },   // assault
+    { 30, 45,  75,  S_ITEMAMMO  },   // cpistol
+    {  1,  0,   3,  S_ITEMAMMO  },   // grenade
+    {100,  0, 100,  S_ITEMAKIMBO}    // akimbo  : CHANGED due to pistol changes
 };
 
 itemstat powerupstats[I_ARMOUR-I_HEALTH+1] =
@@ -482,7 +482,7 @@ guninfo guns[NUMGUNS] =
     { "rifle",      S_RIFLE,      S_RRIFLE,   1800,   720,    60,     0,   0, 10,   60,   10,   4,  4,    10, 60,     60,     150,  1,      false },
     { "shotgun",    S_SHOTGUN,    S_RSHOTGUN, 2400,   1000,   5,      0,   0,  1,   35,   7,    9,  9,    10, 140,    140,    125,  1,      false },   // CHANGED
     { "subgun",     S_SUBGUN,     S_RSUBGUN,  1650,   80,     15,     0,   0, 45,   15,   30,   1,  2,    4,  30,     50,     188,  1,      true  },   // CHANGED : [reI,reB,reM] + spread
-    { "sniper",     S_SNIPER,     S_RSNIPER,  1950,   1500,   83,     0,   0, 50,   50,   5,    4,  4,    10, 85,     85,     100,  1,      false },   // CHANGED : damage, spread
+    { "sniper",     S_SNIPER,     S_RSNIPER,  1950,   1500,   83,     0,   0, 45,   50,   5,    4,  4,    10, 85,     85,     100,  1,      false },   // CHANGED : damage, spread
     { "assault",    S_ASSAULT,    S_RASSAULT, 2000,   120,    24,     0,   0, 20,   40,   20,   0,  2,    2,  22,     55,     115,  1,      true  },   // CHANGED
     { "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 },