diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5c0252b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+*.o
+sea
+sea.exe
+sea.cfg
+.deps/
diff --git a/Makefile b/Makefile
index c68608b..50cac36 100755
--- a/Makefile
+++ b/Makefile
@@ -64,7 +64,8 @@ DEPDIR = .deps
 df = $(DEPDIR)/$(*F)
 
 %.o : %.cpp
-	@$(MAKEDEPEND); \
+	@test -d $(DEPDIR) || mkdir $(DEPDIR); \
+	$(MAKEDEPEND); \
 	  cp $(df).d $(df).P; \
 	  sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
 	      -e '/^$$/ d' -e 's/$$/ :/' < $(df).d >> $(df).P; \
diff --git a/boat.cpp b/boat.cpp
index 5033ad7..227aaf3 100644
--- a/boat.cpp
+++ b/boat.cpp
@@ -10,14 +10,17 @@
 #include "snoutlib/timer.h"
 #include "game.h"
 #include "fx_ship_expl.h"
+#include "data/text/shipnames.h"
 
+int Boat::m_names_used[];
 
-Boat::Boat(vec2 pos,string name,float scale) :
-  m_pos(pos),m_name(name),m_scale(scale),
+Boat::Boat(vec2 pos,int index,float scale) :
+  m_pos(pos),m_scale(scale),
 	m_pos_shift(0.0),m_rot(0.0),
 	m_damaged(false),m_sinking(false), m_obb(AABB(0,0,0,0))
 {
   m_model = &g_resources.mesh_tanker;
+	m_name = randname(index);
 
 	m_smoke = NULL;
 	for(int i=0;i<m_num_bubble_streams;++i)
@@ -31,6 +34,24 @@ Boat::~Boat()
 		delete m_bbl[i];
 }
 
+string Boat::randname(int idx) {
+	if(idx == 0) {
+		int max_idx = 0;
+		while(ship_names[max_idx])
+			max_idx++;
+
+		m_names_used[0] = m_names_used[1] = m_names_used[2] = rand() % max_idx;
+		do {
+			m_names_used[1] = rand() % max_idx;
+		} while(m_names_used[0] == m_names_used[1]); 
+		do {
+			m_names_used[2] = rand() % max_idx;
+		} while(m_names_used[2] == m_names_used[0] || m_names_used[2] == m_names_used[1]);
+		
+	}
+	return string(ship_names[m_names_used[idx]]);
+}
+
 void Boat::hit(float x)
 {
   float hit_pos = x - m_pos[0];
diff --git a/boat.h b/boat.h
index 8e87dfc..1a09ef0 100644
--- a/boat.h
+++ b/boat.h
@@ -11,6 +11,7 @@
 class Boat
 {
 	static const int m_num_bubble_streams = 5;
+	static int m_names_used[3];
 	
   StaticMesh **m_model;
   vec2 m_pos;
@@ -32,10 +33,12 @@ class Boat
 	ParticleEffect *m_bbl[m_num_bubble_streams];
 	float m_bbl_emitpos_x[m_num_bubble_streams];
 
+	string randname(int index);
+
 public:
 	OBB m_obb;
 
-  Boat(vec2 pos,string name="",float scale=0.41);
+  Boat(vec2 pos,int index,float scale=0.41);
 	~Boat();
 
   void draw(void);
diff --git a/data/text/shipnames.h b/data/text/shipnames.h
new file mode 100644
index 0000000..313395d
--- /dev/null
+++ b/data/text/shipnames.h
@@ -0,0 +1,18 @@
+const char *ship_names[] = {
+	"Rainbow Warrior",
+	"Titanic",
+	"Exxon Valdez",
+	"Deepwater Horizon",
+	"Urquiola",
+	"Torrey Canyon",
+	"Irenes Serenade",
+	"Sea Star",
+	"MT Haven",
+	"Amoco Cadiz",
+	"Castillo de Bellver",
+	"ABT Summer",
+	"Atlantic Empress",
+	"Ixtoc I",
+	"Bismarck",
+	NULL
+};
diff --git a/game.cpp b/game.cpp
index b620a3e..91eaf3d 100644
--- a/game.cpp
+++ b/game.cpp
@@ -16,9 +16,9 @@ extern App *g_app;
 
 Game::Game(int difficulty,int wave) : m_score(0), m_difficulty(difficulty), m_wave(wave), m_hiscore_name(""), m_ended(false)
 {
-  m_boats[0] = new Boat(vec2(0.37f,0.24f),"S.S. Epic Failure");
-  m_boats[1] = new Boat(vec2(0.80f,0.24f),"The Slightly Radioactive Whale");
-  m_boats[2] = new Boat(vec2(1.23f,0.24f),"Nice Boat");
+  m_boats[0] = new Boat(vec2(0.37f,0.24f),0);
+  m_boats[1] = new Boat(vec2(0.80f,0.24f),1);
+  m_boats[2] = new Boat(vec2(1.23f,0.24f),2);
 
   m_pboat1 = new PBoat(vec2(0.08f,0.25f));
   m_pboat2 = new PBoat(vec2(1.52f,0.25f));
@@ -253,9 +253,6 @@ void Game::gamemode_specific_stuff(void)
   switch(m_gamemode) {
   //
   case GM_STARTWAVE:
-    m_pboat1->reload_ammo();
-    m_pboat2->reload_ammo();
-
     if (gm_time<=3.0) {
       float alpha = fade_in_out(0.0, 0.5,  2.5, 3.0, gm_time);
       alpha = clamp<float>(alpha,0.0,1.0);