diff --git a/dat/missions/cargo.lua b/dat/missions/cargo.lua
index 5350bef..f60536a 100644
--- a/dat/missions/cargo.lua
+++ b/dat/missions/cargo.lua
@@ -142,7 +142,7 @@ function timeup()
     player.msg(misn_time_msg)
     misn.finish(false)
   end
-  misn.setDesc(string.format( misn_desc[2], planet, system,
+  misn.setDesc(string.format( misn_desc[21], planet, system,
       carg_mass, carg_type,
       time.str(misn_time), time.str(misn_time-time.get())))
 end
diff --git a/src/player.c b/src/player.c
index 5e5c483..f043d06 100644
--- a/src/player.c
+++ b/src/player.c
@@ -1484,10 +1484,14 @@ static int player_saveShip(xmlTextWriterPtr writer, Pilot* ship, char* loc) {
   // Save the commodities.
   xmlw_startElem(writer, "commodities");
   for(i = 0; i < ship->ncommodities; i++) {
-    xmlw_elem(writer, "outfit", ship->commodities[i].commodity->name);
+    xmlw_startElem(writer, "commodity");
+
     xmlw_attr(writer, "quantity", "%d", ship->commodities[i].quantity);
     if(ship->commodities[i].id > 0)
       xmlw_attr(writer, "id", "%d", ship->commodities[i].id);
+    xmlw_str(writer, ship->commodities[i].commodity->name);
+
+    xmlw_endElem(writer); // Commodity.
   }
   xmlw_endElem(writer); // Commodities.
   xmlw_endElem(writer); // Ship.