diff --git a/dat/ship.xml b/dat/ship.xml
index 7e251fb..c7979c5 100644
--- a/dat/ship.xml
+++ b/dat/ship.xml
@@ -24,8 +24,8 @@
 		<characteristics>
 			<crew>2</crew>
 			<mass>32</mass>
-			<cap_weapon>20</cap_weapon>
-			<cap_cargo>25</cap_cargo>
+			<cap_weapon>25</cap_weapon>
+			<cap_cargo>20</cap_cargo>
 		</characteristics>
 		<outfits>
 			<outfit quantity='1'>Laser</outfit>
@@ -55,7 +55,7 @@
     <characteristics>
       <crew>2</crew>
       <mass>25</mass>
-      <cap_weapon>25</cap_weapon>
+      <cap_weapon>30</cap_weapon>
       <cap_cargo>10</cap_cargo>
     </characteristics>
     <outfits>
@@ -87,8 +87,8 @@
 		<characteristics>
 			<crew>9</crew>
 			<mass>130</mass>
-			<cap_weapon>60</cap_weapon>
-			<cap_cargo>40</cap_cargo>
+			<cap_weapon>90</cap_weapon>
+			<cap_cargo>20</cap_cargo>
 			</characteristics>
 		<outfits>
       <outfit quantity="10">Laser</outfit>
diff --git a/src/land.c b/src/land.c
index b9b3032..2270f09 100644
--- a/src/land.c
+++ b/src/land.c
@@ -187,6 +187,12 @@ static void outfits_buy(char* str) {
 
 	q = 1; // Q should be dependant on MOD keys. TODO
 
+	if((player_freeSpace() - outfit->mass) < 0) {
+		toolkit_alert("No enough free space (you need %d more slots).",
+					outfit->mass - player_freeSpace());
+		return;
+	}
+
 	pilot_addOutfit(player, outfit, q);
 	outfits_update(NULL);
 }