diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 79c179bfc..b928c5e4d 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -8,6 +8,7 @@ main/state.c: properly disable cheats when loading a saved game so only cheats t
 main/collide.c, main/physics.c: Fixed double wall-object-damage introduced 20111124 by applying more strict rules to wall-colliding and wall-scraping where latter now is player-exclusive
 main/net_udp.c: in netgame info screen some setting-descriptions were interchanged and displayed wrong toggles
 main/net_udp.c: Since the kicked message is shown after player is technically removed from the game we do not know hosts name anymore. Message changed accordingly
+main/multi.c, main/multi.h, main/newdemo.c, main/player.h: Allow a total of 32 different player ship textures and stored N_PLAYER_SHIP_TEXTURES in player.h
 
 20120324
 --------
diff --git a/main/multi.c b/main/multi.c
index e22298a8b..10664e7c7 100644
--- a/main/multi.c
+++ b/main/multi.c
@@ -2149,7 +2149,7 @@ void multi_reset_object_texture (object *objp)
 		if (N_PLAYER_SHIP_TEXTURES < Polygon_models[objp->rtype.pobj_info.model_num].n_textures)
 			Error("Too many player ship textures!\n");
 
-		for (i=0;i<N_PLAYER_SHIP_TEXTURES;i++)
+		for (i=0;i<Polygon_models[objp->rtype.pobj_info.model_num].n_textures;i++)
 			multi_player_textures[id-1][i] = ObjBitmaps[ObjBitmapPtrs[Polygon_models[objp->rtype.pobj_info.model_num].first_texture+i]];
 
 		multi_player_textures[id-1][4] = ObjBitmaps[ObjBitmapPtrs[First_multi_bitmap_num+(id-1)*2]];
diff --git a/main/multi.h b/main/multi.h
index 579584c0e..ad295fcfb 100644
--- a/main/multi.h
+++ b/main/multi.h
@@ -312,8 +312,6 @@ extern void multi_message_feedback();
 extern int control_invul_time;
 extern int Bounty_target;
 
-#define N_PLAYER_SHIP_TEXTURES 6
-
 extern bitmap_index multi_player_textures[MAX_NUM_NET_PLAYERS][N_PLAYER_SHIP_TEXTURES];
 
 #define NETGAME_FLAG_CLOSED 	1
diff --git a/main/newdemo.c b/main/newdemo.c
index 030961f6b..76c1dad8d 100644
--- a/main/newdemo.c
+++ b/main/newdemo.c
@@ -1634,9 +1634,6 @@ void newdemo_pop_ctrlcen_triggers()
 	}
 }
 
-#define N_PLAYER_SHIP_TEXTURES 6
-
-
 int newdemo_read_frame_information(int rewrite)
 {
 	int done, segnum, side, objnum, soundno, angle, volume, i;
@@ -1742,7 +1739,7 @@ int newdemo_read_frame_information(int rewrite)
 						break;
 					player--;
 
-					for (i=0;i<N_PLAYER_SHIP_TEXTURES;i++)
+					for (i=0;i<Polygon_models[obj->rtype.pobj_info.model_num].n_textures;i++)
 						multi_player_textures[player][i] = ObjBitmaps[ObjBitmapPtrs[Polygon_models[obj->rtype.pobj_info.model_num].first_texture+i]];
 
 					multi_player_textures[player][4] = ObjBitmaps[ObjBitmapPtrs[First_multi_bitmap_num+(player)*2]];
diff --git a/main/player.h b/main/player.h
index 809f511b3..1006ec6b8 100644
--- a/main/player.h
+++ b/main/player.h
@@ -166,6 +166,7 @@ typedef struct player_rw {
 } __pack__ player_rw;
 
 #define N_PLAYER_GUNS 8
+#define N_PLAYER_SHIP_TEXTURES 32
 
 typedef struct player_ship {
 	int 		model_num;