diff --git a/AMBuildScript b/AMBuildScript
index 2e5a74b..e2bc6e8 100644
--- a/AMBuildScript
+++ b/AMBuildScript
@@ -18,7 +18,7 @@ class MMS:
 		self.sdkInfo['l4d'] =   {'sdk': 'HL2SDKL4D',       'ext': '2.l4d',   'def': '5',
 		                         'name': 'LEFT4DEAD',      'platform': ['windows', 'linux']}
 		self.sdkInfo['l4d2'] =  {'sdk': 'HL2SDKL4D2',      'ext': '2.l4d2',  'def': '6',
-		                         'name': 'LEFT4DEAD2',     'platform': ['windows', 'linux']}
+		                         'name': 'LEFT4DEAD2',     'platform': ['windows', 'linux', 'darwin']}
 		self.sdkInfo['darkm'] = {'sdk': 'HL2SDK-DARKM',    'ext': '2.darkm', 'def': '2',
 		                         'name': 'DARKMESSIAH',    'platform': ['windows']}
 		self.sdkInfo['swarm'] = {'sdk': 'HL2SDK-SWARM',    'ext': '2.swarm', 'def': '7',
@@ -34,9 +34,9 @@ class MMS:
 				envvars['HL2SDK'] = 'hl2sdk'
 				envvars['HL2SDKOB'] = 'hl2sdk-ob'
 				envvars['HL2SDKL4D'] = 'hl2sdk-l4d'
-				envvars['HL2SDKL4D2'] = 'hl2sdk-l4d2'
 
 			envvars['HL2SDKOBVALVE'] = 'hl2sdk-ob-valve'
+			envvars['HL2SDKL4D2'] = 'hl2sdk-l4d2'
 
 			#Dark Messiah is Windows-only
 			if AMBuild.target['platform'] == 'windows':
diff --git a/support/buildbot/package.pl b/support/buildbot/package.pl
index 8751ff1..284c1cc 100755
--- a/support/buildbot/package.pl
+++ b/support/buildbot/package.pl
@@ -67,33 +67,25 @@ else
 my ($major,$minor) = ($version =~ /^(\d+)\.(\d+)/);
 $ftp_path .= "/$major.$minor";
 
-if ($^O eq "darwin")
+my ($ftp);
+
+$ftp = Net::FTP->new($ftp_host, Debug => 0) 
+    or die "Cannot connect to host $ftp_host: $@";
+
+$ftp->login($ftp_user, $ftp_pass)
+    or die "Cannot connect to host $ftp_host as $ftp_user: " . $ftp->message . "\n";
+
+if ($ftp_path ne '')
 {
-	# Horrible workaround for weird upload failure
-	system("ftp -Vu ftp://$ftp_user:$ftp_pass\@$ftp_host/$ftp_path/$filename $filename");
+    $ftp->cwd($ftp_path)
+        or die "Cannot change to folder $ftp_path: " . $ftp->message . "\n";
 }
-else
-{
-	my ($ftp);
 
-	$ftp = Net::FTP->new($ftp_host, Debug => 0) 
-	    or die "Cannot connect to host $ftp_host: $@";
+$ftp->binary();
+$ftp->put($filename)
+    or die "Cannot drop file $filename ($ftp_path): " . $ftp->message . "\n";
 
-	$ftp->login($ftp_user, $ftp_pass)
-	    or die "Cannot connect to host $ftp_host as $ftp_user: " . $ftp->message . "\n";
-
-	if ($ftp_path ne '')
-	{
-	    $ftp->cwd($ftp_path)
-	        or die "Cannot change to folder $ftp_path: " . $ftp->message . "\n";
-	}
-
-	$ftp->binary();
-	$ftp->put($filename)
-	    or die "Cannot drop file $filename ($ftp_path): " . $ftp->message . "\n";
-
-	$ftp->close();
-}
+$ftp->close();
 
 print "File sent to drop site as $filename -- build succeeded.\n";