diff --git a/fgd/bases/MomentumPickup.fgd b/fgd/bases/MomentumPickup.fgd
new file mode 100644
index 000000000..74072f14a
--- /dev/null
+++ b/fgd/bases/MomentumPickup.fgd
@@ -0,0 +1,6 @@
+@BaseClass base(BaseEntityPoint)
+	appliesto(MOMENTUM)
+= MomentumPickup
+	[
+	ResetTime(float) : "Delay before reset" : 10 : "How long until the pickup reappears after being picked up. 0 means it won't disappear and negative values mean it won't reappear."
+	]
diff --git a/fgd/point/momentum/momentum_df_weaponspawner.fgd b/fgd/point/momentum/momentum_df_weaponspawner.fgd
deleted file mode 100644
index 87f7a4e1a..000000000
--- a/fgd/point/momentum/momentum_df_weaponspawner.fgd
+++ /dev/null
@@ -1,16 +0,0 @@
-@PointClass base(BaseEntityPoint)
-	appliesto(MOMENTUM) 
-= momentum_df_weaponspawner : "Defrag weapon spawner."
-	[
-	weapon_slot[engine](integer) : "Weapon" : 2
-	weapon_slot(choices) : "Weapon" : 2 : "The weapon to spawn." =
-		[
-		2: "Machine gun"
-		3: "Knife"
-		4: "Grenade launcher"
-		5: "Rocket launcher"
-		8: "Plasma gun"
-		9: "BFG"
-		]
-	reset_time(float) : "Delay before reset" : 10 : "How long until the weapon reappears after being picked up. 0 means it won't disappear and negative values mean it won't reappear."
-	]
diff --git a/fgd/point/momentum/momentum_pickup_ammo.fgd b/fgd/point/momentum/momentum_pickup_ammo.fgd
new file mode 100644
index 000000000..91e720095
--- /dev/null
+++ b/fgd/point/momentum/momentum_pickup_ammo.fgd
@@ -0,0 +1,8 @@
+@PointClass base(MomentumPickup)
+	appliesto(MOMENTUM)
+	size(-43 -43 -36, 43 43 66)
+= momentum_pickup_ammo : "Ammo Pickup"
+	[
+	AmmoName(string) : "Ammo Name" : "" : "The type of ammo to give the player."
+	PickupAmmo(integer) : "Pickup Ammo" : 5 : "The amount of ammo to give the player. Any negative value is infinite ammo."
+	]
diff --git a/fgd/point/momentum/momentum_powerup_damage_boost.fgd b/fgd/point/momentum/momentum_powerup_damage_boost.fgd
new file mode 100644
index 000000000..ab6f359c5
--- /dev/null
+++ b/fgd/point/momentum/momentum_powerup_damage_boost.fgd
@@ -0,0 +1,7 @@
+@PointClass base(MomentumPickup)
+	appliesto(MOMENTUM)
+	size(-43 -43 -36, 43 43 66)
+= momentum_powerup_damage_boost : "Damage Boost Powerup"
+	[
+	DamageBoostTime(float) : "Damage Boost Time" : "30" : "The amount of time in seconds the damage boost effect lasts. Any negative value is infinite duration."
+	]
diff --git a/fgd/point/momentum/momentum_powerup_haste.fgd b/fgd/point/momentum/momentum_powerup_haste.fgd
new file mode 100644
index 000000000..4019c93b7
--- /dev/null
+++ b/fgd/point/momentum/momentum_powerup_haste.fgd
@@ -0,0 +1,7 @@
+@PointClass base(MomentumPickup)
+	appliesto(MOMENTUM)
+	size(-43 -43 -36, 43 43 66)
+= momentum_powerup_haste : "Haste Powerup"
+	[
+	HasteTime(float) : "Haste Time" : "30" : "The amount of time in seconds the haste effect lasts. Any negative value is infinite duration."
+	]
diff --git a/fgd/point/momentum/momentum_weapon_spawner.fgd b/fgd/point/momentum/momentum_weapon_spawner.fgd
new file mode 100644
index 000000000..e464b4274
--- /dev/null
+++ b/fgd/point/momentum/momentum_weapon_spawner.fgd
@@ -0,0 +1,8 @@
+@PointClass base(MomentumPickup)
+	appliesto(MOMENTUM)
+	size(-43 -43 -36, 43 43 66)
+= momentum_weapon_spawner : "Weapon Spawner"
+	[
+	WeaponName(string) : "Weapon Name" : "" : "The name of the weapon to give the player."
+	PickupAmmo(integer) : "Pickup Ammo" : 0 : "The amount of ammo to give the player when they pick up this weapon. Any negative value is infinite ammo."
+	]
diff --git a/fgd/visgroups.cfg b/fgd/visgroups.cfg
index 8adf91092..345aac7c0 100644
--- a/fgd/visgroups.cfg
+++ b/fgd/visgroups.cfg
@@ -834,7 +834,7 @@
 		* `weapon_portalgun`
 		* `weapon_cubemap`
 		* `weapon_paintgun`
-		* `momentum_df_weaponspawner`
+		* `momentum_weapon_spawner`
 	- Items
 		- Ammunition
 			* `item_ammo_357`
@@ -849,6 +849,9 @@
 			* `item_box_mrounds`
 			* `item_box_srounds`
 			* `item_paint_power_pickup`
+
+			# Momentum
+			* `momentum_pickup_ammo`
 		- Large Ammunition
 			* `item_ammo_357_large`
 			* `item_ammo_ar2_large`
@@ -881,6 +884,10 @@
 		* `item_nugget`
 		* `item_boots`
 
+		# Momentum
+		* `momentum_powerup_haste`
+		* `momentum_powerup_damage_boost`
+
 	- World Details
 		- Props
 			- Dynamic