diff --git a/src/Makefile.am b/src/Makefile.am
index ddeb4ccb2a7..14846148f86 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -150,6 +150,7 @@ wesnoth_editor_SOURCES = editor/editor.cpp \
 			 ai.cpp \
 			 ai_attack.cpp \
 			 ai_move.cpp \
+		     builder.cpp \
 		 	 cavegen.cpp \
 			 config.cpp \
 			 cursor.cpp \
@@ -201,6 +202,7 @@ wesnoth_editor_SOURCES = editor/editor.cpp \
 			 ai.hpp \
 			 ai_attack.hpp \
 			 ai_move.hpp \
+		     builder.hpp \
 		 	 cavegen.hpp \
 			 config.hpp \
 			 cursor.hpp \
diff --git a/src/Makefile.in b/src/Makefile.in
index 684f478a144..b47f02fb12e 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -291,6 +291,7 @@ wesnoth_editor_SOURCES = editor/editor.cpp \
 			 ai.cpp \
 			 ai_attack.cpp \
 			 ai_move.cpp \
+		     builder.cpp \
 		 	 cavegen.cpp \
 			 config.cpp \
 			 cursor.cpp \
@@ -342,6 +343,7 @@ wesnoth_editor_SOURCES = editor/editor.cpp \
 			 ai.hpp \
 			 ai_attack.hpp \
 			 ai_move.hpp \
+		     builder.hpp \
 		 	 cavegen.hpp \
 			 config.hpp \
 			 cursor.hpp \
@@ -431,22 +433,22 @@ wesnoth_DEPENDENCIES =
 wesnoth_LDFLAGS =
 am_wesnoth_editor_OBJECTS = editor.$(OBJEXT) actions.$(OBJEXT) \
 	ai.$(OBJEXT) ai_attack.$(OBJEXT) ai_move.$(OBJEXT) \
-	cavegen.$(OBJEXT) config.$(OBJEXT) cursor.$(OBJEXT) \
-	dialogs.$(OBJEXT) display.$(OBJEXT) events.$(OBJEXT) \
-	filesystem.$(OBJEXT) font.$(OBJEXT) game_config.$(OBJEXT) \
-	game_events.$(OBJEXT) gamestatus.$(OBJEXT) hotkeys.$(OBJEXT) \
-	image.$(OBJEXT) intro.$(OBJEXT) key.$(OBJEXT) \
-	language.$(OBJEXT) log.$(OBJEXT) map_label.$(OBJEXT) \
-	map.$(OBJEXT) mapgen.$(OBJEXT) mapgen_dialog.$(OBJEXT) \
-	mouse.$(OBJEXT) network.$(OBJEXT) pathfind.$(OBJEXT) \
-	playlevel.$(OBJEXT) playturn.$(OBJEXT) preferences.$(OBJEXT) \
-	race.$(OBJEXT) replay.$(OBJEXT) reports.$(OBJEXT) \
-	sdl_utils.$(OBJEXT) show_dialog.$(OBJEXT) sound.$(OBJEXT) \
-	statistics.$(OBJEXT) team.$(OBJEXT) terrain.$(OBJEXT) \
-	theme.$(OBJEXT) tooltips.$(OBJEXT) unit.$(OBJEXT) \
-	unit_types.$(OBJEXT) video.$(OBJEXT) button.$(OBJEXT) \
-	menu.$(OBJEXT) textbox.$(OBJEXT) scrollbar.$(OBJEXT) \
-	slider.$(OBJEXT) widget.$(OBJEXT)
+	builder.$(OBJEXT) cavegen.$(OBJEXT) config.$(OBJEXT) \
+	cursor.$(OBJEXT) dialogs.$(OBJEXT) display.$(OBJEXT) \
+	events.$(OBJEXT) filesystem.$(OBJEXT) font.$(OBJEXT) \
+	game_config.$(OBJEXT) game_events.$(OBJEXT) \
+	gamestatus.$(OBJEXT) hotkeys.$(OBJEXT) image.$(OBJEXT) \
+	intro.$(OBJEXT) key.$(OBJEXT) language.$(OBJEXT) log.$(OBJEXT) \
+	map_label.$(OBJEXT) map.$(OBJEXT) mapgen.$(OBJEXT) \
+	mapgen_dialog.$(OBJEXT) mouse.$(OBJEXT) network.$(OBJEXT) \
+	pathfind.$(OBJEXT) playlevel.$(OBJEXT) playturn.$(OBJEXT) \
+	preferences.$(OBJEXT) race.$(OBJEXT) replay.$(OBJEXT) \
+	reports.$(OBJEXT) sdl_utils.$(OBJEXT) show_dialog.$(OBJEXT) \
+	sound.$(OBJEXT) statistics.$(OBJEXT) team.$(OBJEXT) \
+	terrain.$(OBJEXT) theme.$(OBJEXT) tooltips.$(OBJEXT) \
+	unit.$(OBJEXT) unit_types.$(OBJEXT) video.$(OBJEXT) \
+	button.$(OBJEXT) menu.$(OBJEXT) textbox.$(OBJEXT) \
+	scrollbar.$(OBJEXT) slider.$(OBJEXT) widget.$(OBJEXT)
 wesnoth_editor_OBJECTS = $(am_wesnoth_editor_OBJECTS)
 wesnoth_editor_LDADD = $(LDADD)
 wesnoth_editor_DEPENDENCIES =
diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index 2e18e3daf64..da0043ae57e 100644
--- a/src/server/Makefile.am
+++ b/src/server/Makefile.am
@@ -8,6 +8,7 @@ wesnothd_SOURCES = game.cpp \
 		   player.cpp \
 		   server.cpp \
 		   variable.cpp \
+		   ../builder.cpp \
 		   ../config.cpp \
 		   ../filesystem.cpp \
 		   ../game_config.cpp \
@@ -16,6 +17,7 @@ wesnothd_SOURCES = game.cpp \
 		   game.hpp \
 		   ../game_events.hpp \
 		   player.hpp \
+		   ../builder.hpp \
 		   ../config.hpp \
 		   ../filesystem.hpp \
 		   ../game_config.hpp \
diff --git a/src/server/Makefile.in b/src/server/Makefile.in
index 288ba20666d..5e447141603 100644
--- a/src/server/Makefile.in
+++ b/src/server/Makefile.in
@@ -153,6 +153,7 @@ wesnothd_SOURCES = game.cpp \
 		   player.cpp \
 		   server.cpp \
 		   variable.cpp \
+		   ../builder.cpp \
 		   ../config.cpp \
 		   ../filesystem.cpp \
 		   ../game_config.cpp \
@@ -161,6 +162,7 @@ wesnothd_SOURCES = game.cpp \
 		   game.hpp \
 		   ../game_events.hpp \
 		   player.hpp \
+		   ../builder.hpp \
 		   ../config.hpp \
 		   ../filesystem.hpp \
 		   ../game_config.hpp \
@@ -179,8 +181,9 @@ bin_PROGRAMS = wesnothd$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS)
 
 am_wesnothd_OBJECTS = game.$(OBJEXT) player.$(OBJEXT) server.$(OBJEXT) \
-	variable.$(OBJEXT) config.$(OBJEXT) filesystem.$(OBJEXT) \
-	game_config.$(OBJEXT) log.$(OBJEXT) network.$(OBJEXT)
+	variable.$(OBJEXT) builder.$(OBJEXT) config.$(OBJEXT) \
+	filesystem.$(OBJEXT) game_config.$(OBJEXT) log.$(OBJEXT) \
+	network.$(OBJEXT)
 wesnothd_OBJECTS = $(am_wesnothd_OBJECTS)
 wesnothd_LDADD = $(LDADD)
 wesnothd_DEPENDENCIES =
@@ -189,11 +192,11 @@ wesnothd_LDFLAGS =
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/config.Po ./$(DEPDIR)/filesystem.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/game.Po ./$(DEPDIR)/game_config.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/log.Po ./$(DEPDIR)/network.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/player.Po ./$(DEPDIR)/server.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/variable.Po
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/builder.Po ./$(DEPDIR)/config.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/filesystem.Po ./$(DEPDIR)/game.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/game_config.Po ./$(DEPDIR)/log.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/network.Po ./$(DEPDIR)/player.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/server.Po ./$(DEPDIR)/variable.Po
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
@@ -250,6 +253,7 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/builder.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/config.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filesystem.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/game.Po@am__quote@
@@ -282,6 +286,28 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
 
+builder.o: ../builder.cpp
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT builder.o -MD -MP -MF "$(DEPDIR)/builder.Tpo" \
+@am__fastdepCXX_TRUE@	  -c -o builder.o `test -f '../builder.cpp' || echo '$(srcdir)/'`../builder.cpp; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/builder.Tpo" "$(DEPDIR)/builder.Po"; \
+@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/builder.Tpo"; exit 1; \
+@am__fastdepCXX_TRUE@	fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../builder.cpp' object='builder.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/builder.Po' tmpdepfile='$(DEPDIR)/builder.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o builder.o `test -f '../builder.cpp' || echo '$(srcdir)/'`../builder.cpp
+
+builder.obj: ../builder.cpp
+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT builder.obj -MD -MP -MF "$(DEPDIR)/builder.Tpo" \
+@am__fastdepCXX_TRUE@	  -c -o builder.obj `if test -f '../builder.cpp'; then $(CYGPATH_W) '../builder.cpp'; else $(CYGPATH_W) '$(srcdir)/../builder.cpp'; fi`; \
+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/builder.Tpo" "$(DEPDIR)/builder.Po"; \
+@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/builder.Tpo"; exit 1; \
+@am__fastdepCXX_TRUE@	fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../builder.cpp' object='builder.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/builder.Po' tmpdepfile='$(DEPDIR)/builder.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o builder.obj `if test -f '../builder.cpp'; then $(CYGPATH_W) '../builder.cpp'; else $(CYGPATH_W) '$(srcdir)/../builder.cpp'; fi`
+
 config.o: ../config.cpp
 @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT config.o -MD -MP -MF "$(DEPDIR)/config.Tpo" \
 @am__fastdepCXX_TRUE@	  -c -o config.o `test -f '../config.cpp' || echo '$(srcdir)/'`../config.cpp; \