diff --git a/AMBuildScript b/AMBuildScript
index 0525f08..6f02f8f 100644
--- a/AMBuildScript
+++ b/AMBuildScript
@@ -67,7 +67,7 @@ class DHooksConfig(object):
     if builder.options.sm_path:
       self.sm_root = builder.options.sm_path
     else:
-      self.sm_root = ResolveEnvPath('SOURCEMOD17', 'sourcemod-1.7')
+      self.sm_root = ResolveEnvPath('SOURCEMOD18', 'sourcemod-1.8')
 
     if not self.sm_root or not os.path.isdir(self.sm_root):
       raise Exception('Could not find a source copy of Sourcemod')
@@ -235,7 +235,8 @@ class DHooksConfig(object):
       os.path.join(self.sm_root, 'sourcepawn', 'include'),
       os.path.join(self.sm_root, 'sourcepawn', 'vm'),
       os.path.join(self.sm_root, 'sourcepawn', 'vm', 'x86'),
-      os.path.join(self.sm_root, 'public', 'amtl', 'include'),
+	  os.path.join(self.sm_root, 'public', 'amtl', 'include'),
+      os.path.join(self.sm_root, 'public', 'amtl', 'amtl'),
     ]
 	
 
@@ -254,6 +255,8 @@ program.sources += [
   'sdk/smsdk_ext.cpp',
 ]
 
+project.sources += [os.path.join(DHooks.sm_root, 'public', 'smsdk_ext.cpp')]
+
 if os.path.isfile(os.path.join(DHooks.sm_root, 'sourcepawn', 'vm', 'x86', 'assembler-x86.cpp')):
   program.sources += [os.path.join(DHooks.sm_root, 'sourcepawn', 'vm', 'x86', 'assembler-x86.cpp'),]
 elif os.path.isfile(os.path.join(DHooks.sm_root, 'public', 'jit', 'x86', 'assembler-x86.cpp')):
diff --git a/buildbot/bootstrap.pl b/buildbot/bootstrap.pl
index cce30c9..e9d0263 100644
--- a/buildbot/bootstrap.pl
+++ b/buildbot/bootstrap.pl
@@ -19,7 +19,7 @@ our ($root) = getcwd();
 
 #update and configure shiz
 if ($^O eq "darwin") {
-	$ENV{'SOURCEMOD17'} = '/Users/builds/slaves/common/sourcemod-1.7';
+	$ENV{'SOURCEMOD18'} = '/Users/builds/slaves/common/sourcemod-1.8';
 }
 
 rmtree('OUTPUT');