diff --git a/ModPatches/Medieval Overhaul/Defs/Medieval Overhaul/Ammo/MO_Ammo_Medieval.xml b/ModPatches/Medieval Overhaul/Defs/Medieval Overhaul/Ammo/MO_Ammo_Medieval.xml
index ca54395376..65de07fc44 100644
--- a/ModPatches/Medieval Overhaul/Defs/Medieval Overhaul/Ammo/MO_Ammo_Medieval.xml	
+++ b/ModPatches/Medieval Overhaul/Defs/Medieval Overhaul/Ammo/MO_Ammo_Medieval.xml	
@@ -700,31 +700,68 @@
         </modExtensions>
 	</ThingDef>
 
-	<!-- ===== Handgonne Ammos (1-Handed Blunderbuss) ===== -->
+	<!-- ===== Handgonne Ammos ===== -->
 
 	<CombatExtended.AmmoSetDef>
 		<defName>AmmoSet_HandgonneShot</defName>
 		<label>Handgonne Shot</label>
 		<ammoTypes>
+			<Ammo_BlunderbussShot>Bullet_Handgonne_Pellet</Ammo_BlunderbussShot>
 			<Ammo_MusketBall>Bullet_Handgonne_Ball</Ammo_MusketBall>
 		</ammoTypes>
 	</CombatExtended.AmmoSetDef>
 
-	<ThingDef ParentName="Base12GaugeBullet">
-		<defName>Bullet_Handgonne_Ball</defName>
+	<ThingDef ParentName="BlunderbussShotBullet">
+		<defName>Bullet_Handgonne_Pellet</defName>
 		<label>lead pellet</label>
-		<graphicData>
-			<texPath>Things/Projectile/Shotgun_Pellet</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
-		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
 			<damageAmountBase>10</damageAmountBase>
 			<pelletCount>6</pelletCount>
-			<armorPenetrationSharp>2.5</armorPenetrationSharp>
-			<armorPenetrationBlunt>12</armorPenetrationBlunt>
+			<armorPenetrationSharp>1.5</armorPenetrationSharp>
+			<armorPenetrationBlunt>4.5</armorPenetrationBlunt>
 			<spreadMult>22.5</spreadMult>
 			<speed>64</speed>
 		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ProjectileFleck">
+				<FleckDatas>
+					<li>
+						<startDelayTick>0</startDelayTick>
+						<fleck>Fleck_CEBlackpowderSmoke</fleck>
+						<emissionsPerTick>1</emissionsPerTick>
+						<flecksPerEmission>1</flecksPerEmission>
+						<cutoffTickRange>2</cutoffTickRange>
+						<scale>1.5~1.7</scale>
+						<originOffset>0.0~2.5</originOffset>
+					</li>
+				</FleckDatas>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="MusketBallBullet">
+		<defName>Bullet_Handgonne_Ball</defName>
+		<label>lead ball</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageAmountBase>24</damageAmountBase>
+			<armorPenetrationSharp>4</armorPenetrationSharp>
+			<armorPenetrationBlunt>14</armorPenetrationBlunt>
+			<speed>72</speed>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ProjectileFleck">
+				<FleckDatas>
+					<li>
+						<startDelayTick>0</startDelayTick>
+						<fleck>Fleck_CEBlackpowderSmokeShort</fleck>
+						<emissionsPerTick>4</emissionsPerTick>
+						<flecksPerEmission>1</flecksPerEmission>
+						<cutoffTickRange>3~3</cutoffTickRange>
+						<scale>2.0~2.5</scale>
+					</li>
+				</FleckDatas>
+			</li>
+		</comps>
 	</ThingDef>
 
 </Defs>
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/Weapons/MO_Weapons_Ranged.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/Weapons/MO_Weapons_Ranged.xml
index 6229bda810..f951acfe07 100644
--- a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/Weapons/MO_Weapons_Ranged.xml	
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/Weapons/MO_Weapons_Ranged.xml	
@@ -227,18 +227,17 @@
 			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
 			<hasStandardCommand>True</hasStandardCommand>
 			<defaultProjectile>Bullet_Handgonne_Ball</defaultProjectile>
-			<warmupTime>1.66</warmupTime>
+			<warmupTime>2.33</warmupTime>
 			<range>12</range>
 			<soundCast>Shot_Shotgun_NoRack</soundCast>
 			<soundCastTail>GunTail_Heavy</soundCastTail>
 			<muzzleFlashScale>9</muzzleFlashScale>
-			<ammoConsumedPerShotCount>4</ammoConsumedPerShotCount>
 		</Properties>
 		<AmmoUser>
-			<magazineSize>4</magazineSize>
+			<magazineSize>1</magazineSize>
 			<reloadTime>5.1</reloadTime>
 			<ammoSet>AmmoSet_HandgonneShot</ammoSet>
-			<AmmoGenPerMagOverride>4</AmmoGenPerMagOverride>
+			<AmmoGenPerMagOverride>1</AmmoGenPerMagOverride>
 		</AmmoUser>
 		<FireModes>
 			<aiAimMode>AimedShot</aiAimMode>
@@ -246,7 +245,7 @@
 		<weaponTags>
 			<li>NeolithicRangedHeavy</li>
 			<li>NeolithicRangedChief</li>
-			<li>CE_OneHandedWeapon</li>
+			<li>CE_TwoHandedWeapon</li>
 		</weaponTags>
 	</Operation>