diff --git a/dat/ship.xml b/dat/ship.xml
index bbc2b21..12059eb 100644
--- a/dat/ship.xml
+++ b/dat/ship.xml
@@ -4,7 +4,7 @@
   <GFX>lancelot</GFX>
   <GUI>minimal</GUI>
   <sound>engine</sound>
-  <class>civ medium</class>
+  <class>Yacht</class>
   <price>500000</price>
   <fabricator>Nexus</fabricator>
   <tech>7</tech>
@@ -43,7 +43,7 @@
   <GFX>llama</GFX>
   <GUI>minimal</GUI>
   <sound>engine</sound>
-  <class>civ light</class>
+  <class>Yacht</class>
   <price>120000</price>
   <fabricator>Melendez Corp.</fabricator>
   <tech>2</tech>
@@ -76,7 +76,7 @@
   <GFX>hyena</GFX>
   <GUI>minimal</GUI>
   <sound>engine</sound>
-  <class>civ light</class>
+  <class>Fighter</class>
   <price>180000</price>
   <fabricator>Aerosys</fabricator>
   <tech>2</tech>
@@ -109,7 +109,7 @@
   <GFX>pacifier</GFX>
   <GUI>minimal</GUI>
   <sound>engine</sound>
-  <class>civ medium</class>
+  <class>Destroyer</class>
   <price>1200000</price>
   <fabricator>Nexus</fabricator>
   <tech>8</tech>
@@ -145,7 +145,7 @@
   <GFX>pacifier</GFX>
   <GUI>minimal</GUI>
   <sound>engine</sound>
-  <class>mil medium</class>
+  <class>Destroyer</class>
   <price>12000000</price>
   <fabricator>Nexus</fabricator>
   <tech>9999</tech>
@@ -181,7 +181,7 @@
   <GFX>hawking</GFX>
   <GUI>minimal</GUI>
   <sound>engine</sound>
-  <class>civ heavy</class>
+  <class>Cruiser</class>
   <price>7500000</price>
   <fabricator>Nexus</fabricator>
   <tech>9</tech>
@@ -216,7 +216,7 @@
   <GFX target="hawking">hawking_empire</GFX>
   <GUI>minimal</GUI>
   <sound>engine</sound>
-  <class>mil heavy</class>
+  <class>Cruiser</class>
   <price>7500000</price>
   <fabricator>Nexus</fabricator>
   <tech>9999</tech>
@@ -251,7 +251,7 @@
   <GFX>lancelot</GFX>
   <GUI>minimal</GUI>
   <sound>engine</sound>
-  <class>civ medium</class>
+  <class>Fighter</class>
   <price>500000</price>
   <fabricator>Nexus</fabricator>
   <tech>7</tech>
@@ -286,7 +286,7 @@
   <GFX target="lancelot">lancelot_empire</GFX>
   <GUI>minimal</GUI>
   <sound>engine</sound>
-  <class>mil medium</class>
+  <class>Fighter</class>
   <price>500000</price>
   <fabricator>Nexus</fabricator>
   <tech>9999</tech>
@@ -322,7 +322,7 @@
   <GFX>mule</GFX>
   <GUI>minimal</GUI>
   <sound>engine</sound>
-  <class>civ heavy</class>
+  <class>Freighter</class>
   <price>900000</price>
   <fabricator>Melendez Corp</fabricator>
   <tech>5</tech>
@@ -355,7 +355,7 @@
   <GFX>drone</GFX>
   <GUI>minimal</GUI>
   <sound>engine</sound>
-  <class>rob light</class>
+  <class>Drone</class>
   <price>300000</price>
   <fabricator>Robosys</fabricator>
   <tech>99</tech>
@@ -388,7 +388,7 @@
   <GFX>gawain</GFX>
   <GUI>minimal</GUI>
   <sound>engine</sound>
-  <class>civ light</class>
+  <class>Luxury Yacht</class>
   <price>500000</price>
   <fabricator>Nexus</fabricator>
   <tech>11</tech>
@@ -421,7 +421,7 @@
   <GFX>goddard</GFX>
   <GUI>minimal</GUI>
   <sound>engine</sound>
-  <class>civ heavy</class>
+  <class>Cruiser</class>
   <price>11500000</price>
   <fabricator>House Goddard</fabricator>
   <tech>1001</tech>
@@ -457,7 +457,7 @@
   <GFX target="goddard">goddard_draktharr</GFX>
   <GUI>minimal</GUI>
   <sound>engine</sound>
-  <class>mil heavy</class>
+  <class>Cruiser</class>
   <price>11500000</price>
   <fabricator>House Goddard</fabricator> 
   <tech>9999</tech>
@@ -492,7 +492,7 @@
   <GFX>admonisher</GFX>
   <GUI>minimal</GUI>
   <sound>engine</sound>
-  <class>civ medium</class>
+  <class>Corvette</class>
   <price>900000</price>
   <fabricator>Nexus</fabricator>
   <tech>10</tech>
@@ -528,7 +528,7 @@
   <GFX target="admonisher">admonisher_pirate</GFX>
   <GUI>minimal</GUI>
   <sound>engine</sound>
-  <class>civ medium</class>
+  <class>Corvette</class>
   <price>850000</price>
   <fabricator>Skull and Bones</fabricator>
   <tech>9009</tech>
@@ -564,7 +564,7 @@
   <GFX target="admonisher">admonisher_empire</GFX>
   <GUI>minimal</GUI>
   <sound>engine</sound>
-  <class>civ medium</class>
+  <class>Corvette</class>
   <price>900000</price>
   <fabricator>Nexus</fabricator>
   <tech>9999</tech>
@@ -601,7 +601,7 @@
   <GFX>schroedinger</GFX>
   <GUI>minimal</GUI>
   <sound>engine</sound>
-  <class>civ light</class>
+  <class>Scout</class>
   <price>180000</price>
   <fabricator>Sirius Systems</fabricator>
   <tech>5</tech>
@@ -634,7 +634,7 @@
   <GFX>vendetta</GFX>
   <GUI>minimal</GUI>
   <sound>engine</sound>
-  <class>civ light</class>
+  <class>Fighter</class>
   <price>400000</price>
   <fabricator>House Draktharr</fabricator>
   <tech>8</tech>
@@ -667,7 +667,7 @@
   <GFX target="vendetta">vendetta_draktharr</GFX>
   <GUI>minimal</GUI>
   <sound>engine</sound>
-  <class>mil light</class>
+  <class>Fighter</class>
   <price>400000</price>
   <fabricator>House Draktharr</fabricator>
   <tech>9999</tech>
@@ -702,7 +702,7 @@
   <GFX target="vendetta">vendetta_pirate</GFX>
   <GUI>minimal</GUI>
   <sound>engine</sound>
-  <class>civ light</class>
+  <class>Fighter</class>
   <price>450000</price>
   <fabricator>Skull and Bones</fabricator>
   <tech>9009</tech>
@@ -736,7 +736,7 @@
   <GFX>ancestor</GFX>
   <GUI>minimal</GUI>
   <sound>engine</sound>
-  <class>civ light</class>
+  <class>Bomber</class>
   <price>600000</price>
   <fabricator>House Draktharr</fabricator>
   <tech>9</tech>
@@ -771,7 +771,7 @@
   <GFX target="ancestor">ancestor_draktharr</GFX>
   <GUI>minimal</GUI>
   <sound>engine</sound>
-  <class>mil light</class>
+  <class>Bomber</class>
   <price>600000</price>
   <fabricator>House Draktharr</fabricator>
   <tech>9999</tech>
@@ -806,7 +806,7 @@
   <GFX target="ancestor">ancestor_pirate</GFX>
   <GUI>minimal</GUI>
   <sound>engine</sound>
-  <class>civ light</class>
+  <class>Bomber</class>
   <price>550000</price>
   <fabricator>Skull and Bones</fabricator>
   <tech>9009</tech>
diff --git a/src/ship.c b/src/ship.c
index d6885d0..ba96760 100644
--- a/src/ship.c
+++ b/src/ship.c
@@ -182,6 +182,8 @@ ShipClass ship_classFromString(char* str) {
     return SHIP_CLASS_CORVETTE;
   else if(strcmp(str, "Destroyer")==0)
     return SHIP_CLASS_DESTROYER;
+  else if(strcmp(str, "Cruiser")==0)
+    return SHIP_CLASS_CRUISER;
   else if(strcmp(str, "Carrier")==0)
     return SHIP_CLASS_CARRIER;