diff --git a/extras/binarybuilder/BinaryBuilder.cpp b/extras/binarybuilder/BinaryBuilder.cpp
index e9ab6ff81d..64324e1c12 100644
--- a/extras/binarybuilder/BinaryBuilder.cpp
+++ b/extras/binarybuilder/BinaryBuilder.cpp
@@ -11,9 +11,8 @@
   ==============================================================================
 */
 
-#define ONLY_INCLUDE_JUCE_CORE_HEADERS 1
-
-#include "../../juce.h"
+#include "juce_AppConfig.h"
+#include "../../juce_amalgamated.h"
 
 
 //==============================================================================
diff --git a/extras/binarybuilder/juce_AppConfig.h b/extras/binarybuilder/juce_AppConfig.h
new file mode 100644
index 0000000000..fa05cdb520
--- /dev/null
+++ b/extras/binarybuilder/juce_AppConfig.h
@@ -0,0 +1,28 @@
+
+/*
+    This file contains settings that you might want to explicitly apply to 
+    the your build.
+
+    Most of these are turned on or off by default, but you can override
+    that setting here by un-commenting it and giving it a 1 or 0 value.
+*/
+
+#define JUCE_ONLY_BUILD_CORE_LIBRARY   1
+//#define JUCE_FORCE_DEBUG  1
+//#define JUCE_LOG_ASSERTIONS  1
+//#define JUCE_ASIO  1
+//#define JUCE_ALSA  1
+//#define JUCE_QUICKTIME  1
+//#define JUCE_OPENGL  1
+//#define JUCE_USE_FLAC  1
+//#define JUCE_USE_OGGVORBIS  1
+//#define JUCE_USE_CDBURNER  1
+//#define JUCE_ENABLE_REPAINT_DEBUGGING  1
+//#define JUCE_USE_XINERAMA  1
+//#define JUCE_USE_XSHM  1
+//#define JUCE_PLUGINHOST_VST  1
+//#define JUCE_PLUGINHOST_AU  1
+//#define JUCE_BUILD_GUI_CLASSES  1
+//#define JUCE_CHECK_MEMORY_LEAKS  1
+//#define JUCE_CATCH_UNHANDLED_EXCEPTIONS  1
+//#define JUCE_STRINGS_ARE_UNICODE  1
diff --git a/extras/binarybuilder/juce_LibrarySource.cpp b/extras/binarybuilder/juce_LibrarySource.cpp
new file mode 100644
index 0000000000..5567cbfd82
--- /dev/null
+++ b/extras/binarybuilder/juce_LibrarySource.cpp
@@ -0,0 +1,12 @@
+
+/* 
+    This file includes the entire juce source tree via the amalgamated file.
+
+    You could add the amalgamated file directly to your project, but doing it
+    like this allows you to put your app's config settings in the 
+    juce_AppConfig.h file and have them applied to both the juce headers and 
+    the source code.
+*/
+
+#include "juce_AppConfig.h"
+#include "../../juce_amalgamated.cpp"
diff --git a/extras/binarybuilder/vc8/BinaryBuilder.sln b/extras/binarybuilder/vc8/BinaryBuilder.sln
index 97e9844218..f86d4c2be2 100644
--- a/extras/binarybuilder/vc8/BinaryBuilder.sln
+++ b/extras/binarybuilder/vc8/BinaryBuilder.sln
@@ -2,11 +2,6 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BinaryBuilder", "BinaryBuilder.vcproj", "{27423CD3-4ECF-4378-9408-17E01DD339C2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{AE232C11-D91C-4CA1-B24E-8B11A52EFF26} = {AE232C11-D91C-4CA1-B24E-8B11A52EFF26}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JUCE", "..\..\..\build\win32\vc8\JUCE.vcproj", "{AE232C11-D91C-4CA1-B24E-8B11A52EFF26}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -24,14 +19,6 @@ Global
 		{27423CD3-4ECF-4378-9408-17E01DD339C2}.DLL Release|Win32.Build.0 = Release|Win32
 		{27423CD3-4ECF-4378-9408-17E01DD339C2}.Release|Win32.ActiveCfg = Release|Win32
 		{27423CD3-4ECF-4378-9408-17E01DD339C2}.Release|Win32.Build.0 = Release|Win32
-		{AE232C11-D91C-4CA1-B24E-8B11A52EFF26}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AE232C11-D91C-4CA1-B24E-8B11A52EFF26}.Debug|Win32.Build.0 = Debug|Win32
-		{AE232C11-D91C-4CA1-B24E-8B11A52EFF26}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
-		{AE232C11-D91C-4CA1-B24E-8B11A52EFF26}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
-		{AE232C11-D91C-4CA1-B24E-8B11A52EFF26}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
-		{AE232C11-D91C-4CA1-B24E-8B11A52EFF26}.DLL Release|Win32.Build.0 = DLL Release|Win32
-		{AE232C11-D91C-4CA1-B24E-8B11A52EFF26}.Release|Win32.ActiveCfg = Release|Win32
-		{AE232C11-D91C-4CA1-B24E-8B11A52EFF26}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/extras/binarybuilder/vc8/BinaryBuilder.vcproj b/extras/binarybuilder/vc8/BinaryBuilder.vcproj
index 20daa64b66..a87a428bd1 100644
--- a/extras/binarybuilder/vc8/BinaryBuilder.vcproj
+++ b/extras/binarybuilder/vc8/BinaryBuilder.vcproj
@@ -45,7 +45,6 @@
 				InlineFunctionExpansion="0"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				StringPooling="true"
-				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile=".\Release/BinaryBuilder.pch"
 				AssemblerListingLocation=".\Release/"
@@ -115,6 +114,14 @@
 				RelativePath="..\BinaryBuilder.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\juce_AppConfig.h"
+				>
+			</File>
+			<File
+				RelativePath="..\juce_LibrarySource.cpp"
+				>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>