diff --git a/dev/ModuleManager.php b/dev/ModuleManager.php
index a23c2b43b..9005cca6b 100644
--- a/dev/ModuleManager.php
+++ b/dev/ModuleManager.php
@@ -1,9 +1,9 @@
 <?php
 
 /**
- * This is part of the developer tools, and is responsible for installing and uninstalling modules
+ * This is part of the developer tools, and is responsible for installing and uninstalling modules.
  *
- * Please note that this is experimental and the interface may change in the future.
+ * NOTE: This is experimental and the interface may change in the future.
  * Also, it requires that your site is checked into SVN, and that SVN is installed.
  *
  * For best results, use the "sake" command line tool:
@@ -16,6 +16,7 @@ class ModuleManager extends RequestHandlingData {
 	
 	static $allowed_actions = array(
 		'add',
+		'remove',
 	);
 	
 	/**
@@ -25,7 +26,7 @@ class ModuleManager extends RequestHandlingData {
 	 * Usage: sake dev/modules/add ecommerce forum/tags/0.1
 	 */
 	function add() {
-		if(!Director::is_cli()) return new HTTPResponse('ModuleManager only currently works in command-line mode.', 403);
+		if(!Director::is_cli()) return new HTTPResponse('ModuleManager only currently works in command-line mode.', 403);	
 
 		if(isset($_GET['args'])) {
 			$modules = $_GET['args'];
@@ -38,25 +39,70 @@ class ModuleManager extends RequestHandlingData {
 					
 					if($this->svnUrlExists($svnURL)) {
 						$moduleDir = strtok($module,'/');
-						echo "Linking directory '$moduleDir' to '$svnURL' using svn:externals...";
+						echo "Linking directory '$moduleDir' to '$svnURL' using svn:externals...\n";
 						$this->svnAddExternal(Director::baseFolder(), $moduleDir, $svnURL);
 
-						echo "Calling SVN update to get the new code...";
+						echo "Calling SVN update to get the new code...\n";
 						$this->svnUpdate(Director::baseFolder());
 						
-						echo "Rebuilding...";
-						
-						// todo: we should be able to call the 'model' of the builder rather than its 'controller'
-						// it would make it easier to tailor the output
-						$da = new DevelopmentAdmin();
-						$da->build();
+						// We call this through sake so that the _config.php files get reprocessed
+						echo "Rebuilding...\n";
+						$CLI_baseFolder = Director::baseFolder();
+						`cd $CLI_baseFolder; ./sapphire/sake dev/build`;
 						
 					} else {
-						echo "Can't find '$svnURL' in SVN";
+						echo "Can't find '$svnURL' in SVN\n";
 					}
 					
 				} else {
-					echo "Bad module '$module'";
+					echo "Bad module '$module'\n";
+				}
+				
+			}
+			
+		}
+	}
+
+	/**
+	 * Remove a module from this project.
+	 * This is designed to be called from sake.
+	 * 
+	 * Usage: sake dev/modules/remove ecommerce othermodule
+	 */
+	function remove() {
+		if(!Director::is_cli()) return new HTTPResponse('ModuleManager only currently works in command-line mode.', 403);	
+
+		if(isset($_GET['args'])) {
+			$modules = $_GET['args'];
+			foreach($modules as $module) {
+				if(preg_match('/^[a-zA-Z0-9\/_-]+$/', $module)) {
+					$moduleDir = strtok($module,'/');
+					
+					if(is_dir(Director::baseFolder() . '/' . $moduleDir)) {
+						$moduleDir = strtok($module,'/');
+						echo "Removing directory '$moduleDir' from svn:externals...\n";
+						if($this->svnRemoveExternal(Director::baseFolder(), $moduleDir)) {
+							$CLI_moduleDir = escapeshellarg(Director::baseFolder() . '/' . $moduleDir);
+							echo "Removing the physical directory $CLI_moduleDir...\n";
+							`rm -rf $CLI_moduleDir`;
+						
+							echo "Calling SVN update...\n";
+							$this->svnUpdate(Director::baseFolder());
+						
+							// We call this through sake so that the _config.php files get reprocessed
+							echo "Rebuilding...\n";
+							$CLI_baseFolder = Director::baseFolder();
+							`cd $CLI_baseFolder; ./sapphire/sake dev/build`;
+						} else {
+							echo "Directory '$moduleDir' didn't seem to be an svn external\n";
+						}
+						
+					} else {
+						echo "Can't find the '$moduleDir' directory.\n";
+					}
+					
+				} else {
+					echo "Bad module '$module'\n";
 				}
 				
 			}
@@ -95,6 +141,26 @@ class ModuleManager extends RequestHandlingData {
 		$CLI_newExternals = escapeshellarg($newExternals);
 		`svn propset svn:externals $CLI_newExternals $CLI_baseDir`;
 	}
+
+	/**
+	 * Remove an entry from the svn externals.
+	 * @return boolean True if it identified and removed the line, and false if the line couldn't be found
+	 */
+	protected function svnRemoveExternal($baseDir, $externalDir) {
+		$CLI_baseDir = escapeshellarg($baseDir);
+		$oldExternalsArray = explode("\n", trim(`svn propget svn:externals $CLI_baseDir`));
+		foreach($oldExternalsArray as $i => $line) {
+			if(preg_match("/^$externalDir\/?[\t ]/", $line)) {
+				unset($oldExternalsArray[$i]);
+				$newExternals = implode("\n", $oldExternalsArray);
+				$CLI_newExternals = escapeshellarg($newExternals);
+				`svn propset svn:externals $CLI_newExternals $CLI_baseDir`;
+				return true;
+			}
+		}
+		// If we got here, we never found the applicable line
+		return false;
+	}
 	
 }