diff --git a/server/lib/classes/addon_installer.inc.php b/server/lib/classes/addon_installer.inc.php
index 82df5008d7e96e2fcb8cfc20f246667df42be052..0b76ebf9ffcf1342877d91dfc811b18eea9e22c9 100644
--- a/server/lib/classes/addon_installer.inc.php
+++ b/server/lib/classes/addon_installer.inc.php
@@ -176,6 +176,8 @@ class addon_installer {
 			$inst->onAfterInstall();
 		}
 		
+		exec('rm -rf ' . escapeshellarg($tmp_dir));
+		
 		return true;
 	}
 	
diff --git a/server/lib/classes/ispconfig_addon_installer_base.inc.php b/server/lib/classes/ispconfig_addon_installer_base.inc.php
index e02ac00360edfd6ceb091fba5568c4b1da55152d..1e3cf2ec97553937d28d519c803fc9226350e5a9 100644
--- a/server/lib/classes/ispconfig_addon_installer_base.inc.php
+++ b/server/lib/classes/ispconfig_addon_installer_base.inc.php
@@ -85,10 +85,10 @@ class ispconfig_addon_installer_base {
 		if(is_dir($this->temp_dir . '/install')) {
 			$ret = null;
 			$retval = 0;
-			$command = 'cp -rf ' . escapeshellarg($this->temp_dir . '/addon.ini') . ' ' . escapeshellarg($this->temp_dir . '/' . $this->addon_ident . 'addon.php') . ' ' . escapeshellarg($this->temp_dir . '/install'). ' ' . escapeshellarg($install_dir . '/');
+			$command = 'cp -rf ' . escapeshellarg($this->temp_dir . '/addon.ini') . ' ' . escapeshellarg($this->temp_dir . '/' . $this->addon_ident . '.addon.php') . ' ' . escapeshellarg($this->temp_dir . '/install'). ' ' . escapeshellarg($install_dir . '/');
 			exec($command, $ret, $retval);
 			if($retval != 0) {
-				throw new AddonInstallerException('Command ' . $command . ' failed with code ' . $retval);
+				/* TODO: logging */
 			}
 			
 			return true;
@@ -174,7 +174,7 @@ class ispconfig_addon_installer_base {
 	
 	
 	
-	public function onRaisedInstallerEvent($event_name) {
+	public function onRaisedInstallerEvent($event_name, $data) {
 		
 	}
 }