diff --git a/breakpad.bat b/breakpad.bat
new file mode 100644
index 0000000..e1017a5
--- /dev/null
+++ b/breakpad.bat
@@ -0,0 +1,21 @@
+IF EXIST breakpad\NUL GOTO HASBREAKPAD
+mkdir breakpad
+:HASBREAKPAD
+cd breakpad
+
+IF EXIST depot_tools\NUL GOTO HASDEPOTTOOLS
+git clone --depth=1 --branch=master https://chromium.googlesource.com/chromium/tools/depot_tools.git depot_tools
+:HASDEPOTTOOLS
+
+IF EXIST src\NUL GOTO HASSRC
+cmd /c depot_tools\fetch --nohooks --no-history breakpad
+GOTO DONESRC
+:HASSRC
+cmd /c depot_tools\gclient sync --nohooks --no-history
+:DONESRC
+
+IF EXIST gyp\NUL GOTO HASGYP
+git clone --depth=1 --branch=master https://chromium.googlesource.com/external/gyp.git gyp
+:HASGYP
+
+cd ..
diff --git a/breakpad.sh b/breakpad.sh
index 12de791..d900f33 100755
--- a/breakpad.sh
+++ b/breakpad.sh
@@ -12,9 +12,9 @@ if [ ! -d "depot_tools" ]; then
 fi
 
 if [ ! -d "src" ]; then
-  ./depot_tools/fetch breakpad
+  ./depot_tools/fetch --nohooks --no-history breakpad
 else
-  ./depot_tools/gclient sync
+  ./depot_tools/gclient sync --nohooks --no-history
 fi
 
 if [ ! -d "build" ]; then
diff --git a/extension/AMBuilder b/extension/AMBuilder
index b446f75..af0f78d 100644
--- a/extension/AMBuilder
+++ b/extension/AMBuilder
@@ -1,4 +1,4 @@
-# vim: set ts=2 sw=2 tw=99 noet ft=python: 
+# vim: set ts=2 sw=2 tw=99 noet ft=python:
 import os
 import ambuild.osutil as osutil
 from ambuild.command import SymlinkCommand
@@ -21,15 +21,15 @@ def BuildBreakpad():
 
 		breakpad.AddCommand(ShellCommand('CXXFLAGS=-m32 CFLAGS=-m32 CPPFLAGS=-m32 ' + os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'configure')))
 		breakpad.AddCommand(ShellCommand('make src/client/linux/libbreakpad_client.a'))
-		
+
 	elif AMBuild.target['platform'] in ['windows']:
 		if osutil.FileExists(os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'client', 'windows', 'handler', 'Release', 'lib', 'exception_handler.lib')):
 			return
-		
-		gyp = os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'tools', 'gyp', 'gyp.bat')
+
+		gyp = os.path.join(AMBuild.sourceFolder, 'breakpad', 'gyp', 'gyp.bat')
 		gyppath = os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'client', 'windows', 'handler', 'exception_handler.gyp')
-		breakpad.AddCommand(DirectCommand([gyp, gyppath]))
-		
+		breakpad.AddCommand(DirectCommand([gyp, '--no-circular-check', gyppath]))
+
 		slnpath = os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'client', 'windows', 'handler', 'exception_handler.sln')
 		breakpad.AddCommand(DirectCommand(['msbuild', slnpath, '/p:Configuration=Release']))
 
@@ -37,7 +37,7 @@ def BuildExtension():
 	compiler = SM.DefaultCompiler()
 
 	compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'extension'))
-	
+
 	compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache['SOURCEMOD15'], 'public'))
 	compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache['SOURCEMOD15'], 'public', 'extensions'))
 	compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache['SOURCEMOD15'], 'public', 'sourcepawn'))