diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/testRegExp/testRegExp.vcproj b/Source/JavaScriptCore/JavaScriptCore.vcproj/testRegExp/testRegExp.vcproj
index b705390..57b9ce6 100755
--- a/Source/JavaScriptCore/JavaScriptCore.vcproj/testRegExp/testRegExp.vcproj
+++ b/Source/JavaScriptCore/JavaScriptCore.vcproj/testRegExp/testRegExp.vcproj
@@ -50,6 +50,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -111,6 +112,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -172,6 +174,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -233,6 +236,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -295,6 +299,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -356,6 +361,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -417,6 +423,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 			/>
 			<Tool
 				Name="VCALinkTool"
diff --git a/Source/ThirdParty/ANGLE/src/libEGL/libEGL.vcproj b/Source/ThirdParty/ANGLE/src/libEGL/libEGL.vcproj
index c3e8a4b..d02d292 100644
--- a/Source/ThirdParty/ANGLE/src/libEGL/libEGL.vcproj
+++ b/Source/ThirdParty/ANGLE/src/libEGL/libEGL.vcproj
@@ -67,6 +67,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 				AdditionalDependencies="d3d9.lib dxguid.lib dwmapi.lib"
 				LinkIncremental="2"
 				ModuleDefinitionFile="libEGL.def"
@@ -148,6 +149,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 				AdditionalDependencies="d3d9.lib dxguid.lib dwmapi.lib"
 				LinkIncremental="1"
 				ModuleDefinitionFile="libEGL.def"
@@ -232,6 +234,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 				AdditionalDependencies="d3d9.lib dxguid.lib dwmapi.lib"
 				LinkIncremental="2"
 				ModuleDefinitionFile="libEGL.def"
@@ -314,6 +317,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 				AdditionalDependencies="d3d9.lib dxguid.lib dwmapi.lib"
 				LinkIncremental="1"
 				ModuleDefinitionFile="libEGL.def"
diff --git a/Source/ThirdParty/ANGLE/src/libGLESv2/libGLESv2.vcproj b/Source/ThirdParty/ANGLE/src/libGLESv2/libGLESv2.vcproj
index 3bc8363..d97d4e9 100644
--- a/Source/ThirdParty/ANGLE/src/libGLESv2/libGLESv2.vcproj
+++ b/Source/ThirdParty/ANGLE/src/libGLESv2/libGLESv2.vcproj
@@ -67,6 +67,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 				AdditionalDependencies="d3d9.lib D3dx9.lib d3dcompiler.lib"
 				LinkIncremental="2"
 				ModuleDefinitionFile="libGLESv2.def"
@@ -147,6 +148,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 				AdditionalDependencies="d3d9.lib D3dx9.lib d3dcompiler.lib"
 				LinkIncremental="1"
 				IgnoreAllDefaultLibraries="false"
@@ -231,6 +233,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 				AdditionalDependencies="d3d9.lib D3dx9.lib d3dcompiler.lib"
 				LinkIncremental="2"
 				ModuleDefinitionFile="libGLESv2.def"
@@ -312,6 +315,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 				AdditionalDependencies="d3d9.lib D3dx9.lib d3dcompiler.lib"
 				LinkIncremental="1"
 				IgnoreAllDefaultLibraries="false"
diff --git a/Source/ThirdParty/gtest/msvc/gtest_prod_test-md.vcproj b/Source/ThirdParty/gtest/msvc/gtest_prod_test-md.vcproj
index 4071d28..255b494 100644
--- a/Source/ThirdParty/gtest/msvc/gtest_prod_test-md.vcproj
+++ b/Source/ThirdParty/gtest/msvc/gtest_prod_test-md.vcproj
@@ -31,6 +31,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 				OutputFile="$(OutDir)/gtest_prod_test.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
@@ -76,6 +77,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 				OutputFile="$(OutDir)/gtest_prod_test.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
diff --git a/Source/ThirdParty/gtest/msvc/gtest_prod_test.vcproj b/Source/ThirdParty/gtest/msvc/gtest_prod_test.vcproj
index 998c758..8fe6f24 100644
--- a/Source/ThirdParty/gtest/msvc/gtest_prod_test.vcproj
+++ b/Source/ThirdParty/gtest/msvc/gtest_prod_test.vcproj
@@ -31,6 +31,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 				OutputFile="$(OutDir)/gtest_prod_test.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
@@ -76,6 +77,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 				OutputFile="$(OutDir)/gtest_prod_test.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
diff --git a/Source/ThirdParty/gtest/msvc/gtest_unittest-md.vcproj b/Source/ThirdParty/gtest/msvc/gtest_unittest-md.vcproj
index 1525939..aeaefd0 100644
--- a/Source/ThirdParty/gtest/msvc/gtest_unittest-md.vcproj
+++ b/Source/ThirdParty/gtest/msvc/gtest_unittest-md.vcproj
@@ -31,6 +31,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 				OutputFile="$(OutDir)/gtest_unittest.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
@@ -76,6 +77,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 				OutputFile="$(OutDir)/gtest_unittest.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
diff --git a/Source/ThirdParty/gtest/msvc/gtest_unittest.vcproj b/Source/ThirdParty/gtest/msvc/gtest_unittest.vcproj
index 2b2d743..5603469 100644
--- a/Source/ThirdParty/gtest/msvc/gtest_unittest.vcproj
+++ b/Source/ThirdParty/gtest/msvc/gtest_unittest.vcproj
@@ -31,6 +31,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 				OutputFile="$(OutDir)/gtest_unittest.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
@@ -76,6 +77,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 				OutputFile="$(OutDir)/gtest_unittest.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
diff --git a/Tools/CLWrapper/CLWrapper.vcproj b/Tools/CLWrapper/CLWrapper.vcproj
index 844d72a..3563692 100644
--- a/Tools/CLWrapper/CLWrapper.vcproj
+++ b/Tools/CLWrapper/CLWrapper.vcproj
@@ -60,6 +60,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 				OutputFile="$(OutDir)\cl.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
@@ -134,6 +135,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 				OutputFile="$(OutDir)\cl.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
diff --git a/Tools/DumpRenderTree/win/DumpRenderTreeLauncher.vcproj b/Tools/DumpRenderTree/win/DumpRenderTreeLauncher.vcproj
index 72050b1..de8a1db 100644
--- a/Tools/DumpRenderTree/win/DumpRenderTreeLauncher.vcproj
+++ b/Tools/DumpRenderTree/win/DumpRenderTreeLauncher.vcproj
@@ -50,6 +50,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -111,6 +112,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -172,6 +174,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -233,6 +236,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -295,6 +299,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -356,6 +361,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 			/>
 			<Tool
 				Name="VCALinkTool"
diff --git a/Tools/MIDLWrapper/MIDLWrapper.vcproj b/Tools/MIDLWrapper/MIDLWrapper.vcproj
index d9ab9f9..598f9ec 100644
--- a/Tools/MIDLWrapper/MIDLWrapper.vcproj
+++ b/Tools/MIDLWrapper/MIDLWrapper.vcproj
@@ -60,6 +60,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 				OutputFile="$(OutDir)\midl.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
@@ -134,6 +135,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 				OutputFile="$(OutDir)\midl.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 81f460a..5b3bc89 100644
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,13 @@
+2012-08-14  Alex Christensen  <alex.christensen@flexsim.com>
+
+        /SAFESEH should not be a common linker option
+        https://bugs.webkit.org/show_bug.cgi?id=89372
+
+        Reviewed by Darin Adler.
+
+        * win/tools/vsprops/common.vsprops:
+        removed /SAFESEH as a default option for the linker (doesn't work for x64)
+
 2012-08-13  Roger Fong  <roger_fong@apple.com>
 
         Enable CSS Sticky Position on Windows.
diff --git a/WebKitLibraries/win/tools/vsprops/common.vsprops b/WebKitLibraries/win/tools/vsprops/common.vsprops
index 6a6a874..b1ef21c 100644
--- a/WebKitLibraries/win/tools/vsprops/common.vsprops
+++ b/WebKitLibraries/win/tools/vsprops/common.vsprops
@@ -25,7 +25,7 @@
 	<Tool
 		Name="VCLinkerTool"
 		LinkLibraryDependencies="false"
-		AdditionalOptions="/SAFESEH /FIXED:NO /dynamicbase /ignore:4221"
+		AdditionalOptions="/FIXED:NO /dynamicbase /ignore:4221"
 		OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).exe"
 		AdditionalLibraryDirectories="&quot;$(ConfigurationBuildDir)\lib&quot;;&quot;$(WebKitLibrariesDir)\lib&quot;"
 		GenerateDebugInformation="true"