diff --git a/Scripting/ERM/Makefile.am b/Scripting/ERM/Makefile.am
index 0400fdf47..88e5d834a 100644
--- a/Scripting/ERM/Makefile.am
+++ b/Scripting/ERM/Makefile.am
@@ -4,7 +4,7 @@ StdInc.h.gch: StdInc.h
 	$(CXXCOMPILE) -DVCMI_DLL -fPIC -c $<
 
 vcmiscripting_LTLIBRARIES = libvcmiERM.la
-libvcmiERM_la_LIBADD = @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @BOOST_IOSTREAMS_LIB@
+libvcmiERM_la_LIBADD = @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@
 libvcmiERM_la_CXXFLAGS = -DVCMI_DLL
 libvcmiERM_la_SOURCES = \
 	ERMInterpreter.cpp \
diff --git a/Scripting/ERM/Makefile.in b/Scripting/ERM/Makefile.in
index e6c5caceb..e2b4f971f 100644
--- a/Scripting/ERM/Makefile.in
+++ b/Scripting/ERM/Makefile.in
@@ -277,7 +277,7 @@ top_srcdir = @top_srcdir@
 vcmiscriptingdir = $(VCMI_SCRIPTING_LIBS_DIR)
 BUILT_SOURCES = StdInc.h.gch
 vcmiscripting_LTLIBRARIES = libvcmiERM.la
-libvcmiERM_la_LIBADD = @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @BOOST_IOSTREAMS_LIB@
+libvcmiERM_la_LIBADD = @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@
 libvcmiERM_la_CXXFLAGS = -DVCMI_DLL
 libvcmiERM_la_SOURCES = \
 	ERMInterpreter.cpp \
diff --git a/client/Makefile.am b/client/Makefile.am
index 0cf77c232..b7a8f9577 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -1,7 +1,7 @@
 bin_PROGRAMS = vcmiclient
 
 desktopdir = $(datadir)/applications
-desktop_DATA = vcmiclient.desktop
+desktop_DATA = icons/vcmiclient.desktop
 
 EXTRA_DIST = \
   ${desktop_DATA}
@@ -16,7 +16,7 @@ BUILT_SOURCES = StdInc.h.gch
 StdInc.h.gch: StdInc.h
 	$(CXXCOMPILE) -c $<
 
-vcmiclient_LDADD = $(top_builddir)/lib/libvcmi.la @SDL_LIBS@ @FFMPEG_LIBS@ @BOOST_PROGRAM_OPTIONS_LIB@ @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @BOOST_IOSTREAMS_LIB@ -lz
+vcmiclient_LDADD = $(top_builddir)/lib/libvcmi.la @SDL_LIBS@ @FFMPEG_LIBS@ @BOOST_PROGRAM_OPTIONS_LIB@ @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ -lz
 vcmiclient_CXXFLAGS = @SDL_CFLAGS@ @FFMPEG_CXXFLAGS@
 vcmiclient_LDFLAGS = -L$(top_builddir)/lib
 vcmiclient_SOURCES =  \
diff --git a/client/Makefile.in b/client/Makefile.in
index caccc026e..6a356fb4a 100644
--- a/client/Makefile.in
+++ b/client/Makefile.in
@@ -306,12 +306,12 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 desktopdir = $(datadir)/applications
-desktop_DATA = vcmiclient.desktop
+desktop_DATA = icons/vcmiclient.desktop
 EXTRA_DIST = \
   ${desktop_DATA}
 
 BUILT_SOURCES = StdInc.h.gch
-vcmiclient_LDADD = $(top_builddir)/lib/libvcmi.la @SDL_LIBS@ @FFMPEG_LIBS@ @BOOST_PROGRAM_OPTIONS_LIB@ @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @BOOST_IOSTREAMS_LIB@ -lz
+vcmiclient_LDADD = $(top_builddir)/lib/libvcmi.la @SDL_LIBS@ @FFMPEG_LIBS@ @BOOST_PROGRAM_OPTIONS_LIB@ @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ -lz
 vcmiclient_CXXFLAGS = @SDL_CFLAGS@ @FFMPEG_CXXFLAGS@
 vcmiclient_LDFLAGS = -L$(top_builddir)/lib
 vcmiclient_SOURCES = \
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 6e994b7fa..ab6c44e9b 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -3,7 +3,7 @@ StdInc.h.gch: StdInc.h
 	$(CXXCOMPILE) -DVCMI_DLL -fPIC -c $<
 
 pkglib_LTLIBRARIES = libvcmi.la
-libvcmi_la_LIBADD = @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @BOOST_IOSTREAMS_LIB@ -lz -lpthread
+libvcmi_la_LIBADD = @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ -lz -lpthread
 libvcmi_la_CXXFLAGS = @SDL_CFLAGS@ -DVCMI_DLL
 libvcmi_la_SOURCES = \
 	../Global.h \
diff --git a/lib/Makefile.in b/lib/Makefile.in
index aff95580a..13bd583d5 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -294,7 +294,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 BUILT_SOURCES = StdInc.h.gch
 pkglib_LTLIBRARIES = libvcmi.la
-libvcmi_la_LIBADD = @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @BOOST_IOSTREAMS_LIB@ -lz -lpthread
+libvcmi_la_LIBADD = @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ -lz -lpthread
 libvcmi_la_CXXFLAGS = @SDL_CFLAGS@ -DVCMI_DLL
 libvcmi_la_SOURCES = \
 	../Global.h \