diff --git a/include/Game/Systems/HealthSystem.h b/include/Game/Systems/HealthSystem.h
index 46f24630..61456d5d 100644
--- a/include/Game/Systems/HealthSystem.h
+++ b/include/Game/Systems/HealthSystem.h
@@ -12,6 +12,7 @@
 
 #include <tuple>
 #include <vector>
+#include <algorithm>
 
 class HealthSystem : public PureSystem
 {
diff --git a/resources/Schema/Components/HealthPickup.xsd b/resources/Schema/Components/HealthPickup.xsd
index c5fae00f..bf3b327c 100644
--- a/resources/Schema/Components/HealthPickup.xsd
+++ b/resources/Schema/Components/HealthPickup.xsd
@@ -13,7 +13,7 @@
 					<xs:annotation><xs:documentation>The respawn timer for a health pickup</xs:documentation></xs:annotation>
 				</xs:element>			
 				<xs:element name="HealthGain" type="t:double" minOccurs="0">
-					<xs:annotation><xs:documentation>How much health the player will get when he picks the healthPickup up</xs:documentation></xs:annotation>
+					<xs:annotation><xs:documentation>How much percent max-health the player will get when he picks the healthPickup up</xs:documentation></xs:annotation>
 				</xs:element>			
 			</xs:all>
 		</xs:complexType>
diff --git a/src/Game/Systems/HealthSystem.cpp b/src/Game/Systems/HealthSystem.cpp
index 91cae148..94d98222 100644
--- a/src/Game/Systems/HealthSystem.cpp
+++ b/src/Game/Systems/HealthSystem.cpp
@@ -18,7 +18,7 @@ bool HealthSystem::OnPlayerDamaged(Events::PlayerDamage& e)
     ComponentWrapper cHealth = e.Player["Health"];
     double& health = cHealth["Health"];
     health -= e.Damage;
-    
+
     if (health <= 0.0) {
         m_World->DeleteEntity(e.Player.ID);
     }
@@ -30,8 +30,8 @@ bool HealthSystem::OnPlayerHealthPickup(Events::PlayerHealthPickup& e)
 {
     ComponentWrapper cHealth = e.Player["Health"];
     double& health = cHealth["Health"];
-    //NOTE: its possible to get more than MaxHealth health
     health += e.HealthAmount;
+    health = std::min(health, (double)cHealth["MaxHealth"]);
 
     return true;
 }
diff --git a/src/Game/Systems/PickupSpawnSystem.cpp b/src/Game/Systems/PickupSpawnSystem.cpp
index 783f7a62..e9f201c1 100644
--- a/src/Game/Systems/PickupSpawnSystem.cpp
+++ b/src/Game/Systems/PickupSpawnSystem.cpp
@@ -43,10 +43,16 @@ bool PickupSpawnSystem::OnTriggerTouch(Events::TriggerTouch& e)
     if (!e.Trigger.HasComponent("HealthPickup")) {
         return false;
     }
+    double healthGiven = 0.01*(double)e.Trigger["HealthPickup"]["HealthGain"] * (double)e.Entity["Health"]["MaxHealth"];
+    //cant pick up healthpacks if you are already at MaxHealth
+    if ((double)e.Entity["Health"]["Health"] >= (double)e.Entity["Health"]["MaxHealth"]) {
+        return false;
+    }
+
     //personEntered = e.Entity, thingEntered = e.Trigger
     Events::PlayerHealthPickup ePlayerHealthPickup;
-    ePlayerHealthPickup.HealthAmount = e.Trigger["HealthPickup"]["HealthGain"];
-    ePlayerHealthPickup.PlayerHealedID = e.Entity.ID;
+    ePlayerHealthPickup.HealthAmount = healthGiven;
+    ePlayerHealthPickup.Player = e.Entity;
     m_EventBroker->Publish(ePlayerHealthPickup);
 
     //copy position, healthgain, respawntimer (twice since one of the values will be counted down to 0, the other will be set in the new object)