diff --git a/SConstruct b/SConstruct
index e7400f93..3f28da6c 100644
--- a/SConstruct
+++ b/SConstruct
@@ -675,8 +675,6 @@ if sys.platform == 'win32':
 	installTargets += env.Install('dist', dllprefix + 'xerces-c_3_0.dll')
 	installTargets += env.Install('dist', dllprefix + 'glew32mx.dll')
 	installTargets += env.Install('dist', dllprefix + 'libcollada14dom21.dll')
-	installTargets += env.Install('dist', dllprefix + 'boost_system-vc90-mt-1_39.dll')
-	installTargets += env.Install('dist', dllprefix + 'boost_filesystem-vc90-mt-1_39.dll')
 	if hasQt:
 		installTargets += env.Install('dist', env['QT4_BINPATH']+'/QtCore4.dll')
 		installTargets += env.Install('dist', env['QT4_BINPATH']+'/QtGui4.dll')
@@ -719,8 +717,6 @@ elif sys.platform == 'darwin':
 	installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'tools/darwin/Xerces-C.framework/Resources/lib/libxerces-c-3.0.dylib')
 	installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'tools/darwin/libpng.framework/Resources/lib/libpng.dylib')
 	installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'tools/darwin/libjpeg.framework/Resources/lib/libjpeg.dylib')
-	installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'tools/darwin/libboost.framework/Resources/lib/libboost_system-xgcc42-mt-1_39.dylib')
-	installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'tools/darwin/libboost.framework/Resources/lib/libboost_filesystem-xgcc42-mt-1_39.dylib')
 	if hasCollada:
 		installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'tools/darwin/Collada14Dom.framework/Resources/lib/libCollada14Dom.dylib')
 	if hasQt:
diff --git a/config/config-msvc2008-win32.py b/config/config-msvc2008-win32.py
index 1eb6a93c..dc8b3266 100644
--- a/config/config-msvc2008-win32.py
+++ b/config/config-msvc2008-win32.py
@@ -14,7 +14,7 @@ OEXRINCLUDE    = ['#tools/windows/include/OpenEXR']
 OEXRFLAGS      = ['/D', 'OPENEXR_DLL']
 OEXRLIB        = ['IlmImf', 'IlmThread', 'Iex', 'zlib1', 'Half']
 BOOSTINCLUDE   = ['#tools/boost']
-BOOSTLIB       = ['libboost_system', 'libboost_filesystem']
+BOOSTLIB       = ['libboost_system-vc90-mt-1_39', 'libboost_filesystem-vc90-mt-1_39']
 COLLADAINCLUDE = ['#tools/windows/include/colladadom', '#tools/windows/include/colladadom/1.4']
 COLLADALIB     = ['libcollada14dom21']
 XERCESLIB      = ['xerces-c_3']
diff --git a/config/config-msvc2008-win64.py b/config/config-msvc2008-win64.py
index 1dcf9c94..870d088c 100644
--- a/config/config-msvc2008-win64.py
+++ b/config/config-msvc2008-win64.py
@@ -14,7 +14,7 @@ OEXRINCLUDE    = ['#tools/windows/include/OpenEXR']
 OEXRFLAGS      = ['/D', 'OPENEXR_DLL']
 OEXRLIB        = ['IlmImf', 'IlmThread', 'Iex', 'zlib1', 'Half']
 BOOSTINCLUDE   = ['#tools/boost']
-BOOSTLIB       = ['libboost_system', 'libboost_filesystem']
+BOOSTLIB       = ['libboost_system-vc90-mt-1_39', 'libboost_filesystem-vc90-mt-1_39']
 COLLADAINCLUDE = ['#tools/windows/include/colladadom', '#tools/windows/include/colladadom/1.4']
 COLLADALIB     = ['libcollada14dom21']
 XERCESLIB      = ['xerces-c_3']
diff --git a/config/config-msvc2010-win32.py b/config/config-msvc2010-win32.py
index da007d2b..99ba9af7 100644
--- a/config/config-msvc2010-win32.py
+++ b/config/config-msvc2010-win32.py
@@ -14,7 +14,7 @@ OEXRINCLUDE    = ['#tools/windows/include/OpenEXR']
 OEXRFLAGS      = ['/D', 'OPENEXR_DLL']
 OEXRLIB        = ['IlmImf', 'IlmThread', 'Iex', 'zlib1', 'Half']
 BOOSTINCLUDE   = ['#tools/boost']
-BOOSTLIB       = ['libboost_system', 'libboost_filesystem']
+BOOSTLIB       = ['libboost_system-vc100-mt-1_39', 'libboost_filesystem-vc100-mt-1_39']
 COLLADAINCLUDE = ['#tools/windows/include/colladadom', '#tools/windows/include/colladadom/1.4']
 COLLADALIB     = ['libcollada14dom21']
 XERCESLIB      = ['xerces-c_3']
diff --git a/config/config-msvc2010-win64.py b/config/config-msvc2010-win64.py
index b9c99719..65c10d7c 100644
--- a/config/config-msvc2010-win64.py
+++ b/config/config-msvc2010-win64.py
@@ -14,7 +14,7 @@ OEXRINCLUDE    = ['#tools/windows/include/OpenEXR']
 OEXRFLAGS      = ['/D', 'OPENEXR_DLL']
 OEXRLIB        = ['IlmImf', 'IlmThread', 'Iex', 'zlib1', 'Half']
 BOOSTINCLUDE   = ['#tools/boost']
-BOOSTLIB       = ['libboost_system', 'libboost_filesystem']
+BOOSTLIB       = ['libboost_system-vc100-mt-1_39', 'libboost_filesystem-vc100-mt-1_39']
 COLLADAINCLUDE = ['#tools/windows/include/colladadom', '#tools/windows/include/colladadom/1.4']
 COLLADALIB     = ['libcollada14dom21']
 XERCESLIB      = ['xerces-c_3']
diff --git a/tools/windows/lib32/boost_filesystem-vc90-mt-1_39.dll b/tools/windows/lib32/boost_filesystem-vc90-mt-1_39.dll
deleted file mode 100644
index f9f314d4..00000000
Binary files a/tools/windows/lib32/boost_filesystem-vc90-mt-1_39.dll and /dev/null differ
diff --git a/tools/windows/lib32/boost_system-vc90-mt-1_39.dll b/tools/windows/lib32/boost_system-vc90-mt-1_39.dll
deleted file mode 100644
index e83d8f27..00000000
Binary files a/tools/windows/lib32/boost_system-vc90-mt-1_39.dll and /dev/null differ
diff --git a/tools/windows/lib32/libboost_filesystem-vc100-mt-1_39.lib b/tools/windows/lib32/libboost_filesystem-vc100-mt-1_39.lib
new file mode 100644
index 00000000..6a1717b6
Binary files /dev/null and b/tools/windows/lib32/libboost_filesystem-vc100-mt-1_39.lib differ
diff --git a/tools/windows/lib32/libboost_filesystem-vc90-mt-1_39.lib b/tools/windows/lib32/libboost_filesystem-vc90-mt-1_39.lib
new file mode 100644
index 00000000..1a5f08d7
Binary files /dev/null and b/tools/windows/lib32/libboost_filesystem-vc90-mt-1_39.lib differ
diff --git a/tools/windows/lib32/libboost_filesystem.lib b/tools/windows/lib32/libboost_filesystem.lib
deleted file mode 100644
index 06b6ace5..00000000
Binary files a/tools/windows/lib32/libboost_filesystem.lib and /dev/null differ
diff --git a/tools/windows/lib32/libboost_system-vc100-mt-1_39.lib b/tools/windows/lib32/libboost_system-vc100-mt-1_39.lib
new file mode 100644
index 00000000..eea7a67c
Binary files /dev/null and b/tools/windows/lib32/libboost_system-vc100-mt-1_39.lib differ
diff --git a/tools/windows/lib32/libboost_system-vc90-mt-1_39.lib b/tools/windows/lib32/libboost_system-vc90-mt-1_39.lib
new file mode 100644
index 00000000..00c6f4e5
Binary files /dev/null and b/tools/windows/lib32/libboost_system-vc90-mt-1_39.lib differ
diff --git a/tools/windows/lib32/libboost_system.lib b/tools/windows/lib32/libboost_system.lib
deleted file mode 100644
index ae94d560..00000000
Binary files a/tools/windows/lib32/libboost_system.lib and /dev/null differ
diff --git a/tools/windows/lib64/boost_filesystem-vc90-mt-1_39.dll b/tools/windows/lib64/boost_filesystem-vc90-mt-1_39.dll
deleted file mode 100644
index 43b80e2d..00000000
Binary files a/tools/windows/lib64/boost_filesystem-vc90-mt-1_39.dll and /dev/null differ
diff --git a/tools/windows/lib64/boost_system-vc90-mt-1_39.dll b/tools/windows/lib64/boost_system-vc90-mt-1_39.dll
deleted file mode 100644
index df10d70d..00000000
Binary files a/tools/windows/lib64/boost_system-vc90-mt-1_39.dll and /dev/null differ
diff --git a/tools/windows/lib64/libboost_filesystem-vc100-mt-1_39.lib b/tools/windows/lib64/libboost_filesystem-vc100-mt-1_39.lib
new file mode 100644
index 00000000..49892835
Binary files /dev/null and b/tools/windows/lib64/libboost_filesystem-vc100-mt-1_39.lib differ
diff --git a/tools/windows/lib64/libboost_filesystem-vc90-mt-1_39.lib b/tools/windows/lib64/libboost_filesystem-vc90-mt-1_39.lib
new file mode 100644
index 00000000..8ca4e9fd
Binary files /dev/null and b/tools/windows/lib64/libboost_filesystem-vc90-mt-1_39.lib differ
diff --git a/tools/windows/lib64/libboost_filesystem.lib b/tools/windows/lib64/libboost_filesystem.lib
deleted file mode 100644
index 1f53205b..00000000
Binary files a/tools/windows/lib64/libboost_filesystem.lib and /dev/null differ
diff --git a/tools/windows/lib64/libboost_system-vc100-mt-1_39.lib b/tools/windows/lib64/libboost_system-vc100-mt-1_39.lib
new file mode 100644
index 00000000..44d238ca
Binary files /dev/null and b/tools/windows/lib64/libboost_system-vc100-mt-1_39.lib differ
diff --git a/tools/windows/lib64/libboost_system-vc90-mt-1_39.lib b/tools/windows/lib64/libboost_system-vc90-mt-1_39.lib
new file mode 100644
index 00000000..5e9a3178
Binary files /dev/null and b/tools/windows/lib64/libboost_system-vc90-mt-1_39.lib differ
diff --git a/tools/windows/lib64/libboost_system.lib b/tools/windows/lib64/libboost_system.lib
deleted file mode 100644
index 22f78a87..00000000
Binary files a/tools/windows/lib64/libboost_system.lib and /dev/null differ