diff --git a/apps/files_archive/appinfo/app.php b/apps/files_archive/appinfo/app.php
index 67376c4a03acf913e9c254e07ba6b67196d952a5..e6026670264281f982f1729e9c12c0569158dc34 100644
--- a/apps/files_archive/appinfo/app.php
+++ b/apps/files_archive/appinfo/app.php
@@ -7,7 +7,9 @@
  */
 
 OC::$CLASSPATH['OC_Filestorage_Archive']='apps/files_archive/lib/storage.php';
+OC::$CLASSPATH['OC_Files_Versions_Hooks_Handler'] = 'files_versions/lib/hooks_handler.php';
 
 OCP\Util::connectHook('OC_Filesystem','get_mountpoint','OC_Filestorage_Archive','autoMount');
+OCP\Util::connectHook('OC_Filesystem', 'delete', "OC_Files_Versions_Hooks_Handler", "removeVersions");
 
 OCP\Util::addscript( 'files_archive', 'archive' );
diff --git a/apps/files_versions/lib/hooks_handler.php b/apps/files_versions/lib/hooks_handler.php
new file mode 100644
index 0000000000000000000000000000000000000000..4be2d1c284be724cea8ccc91c62a69e61b6b4b1d
--- /dev/null
+++ b/apps/files_versions/lib/hooks_handler.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+* ownCloud - hooks handler of the Versions app
+*
+* @author Bjoern Schiessle
+* @copyright 2012 Bjoern Schiessle schiessle@owncloud.com
+* 
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either 
+* version 3 of the License, or any later version.
+* 
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*	
+* You should have received a copy of the GNU Lesser General Public 
+* License along with this library. If not, see <http://www.gnu.org/licenses/>.
+* 
+*/
+
+class OC_Files_Versions_Hooks_Handler {
+
+	public static function removeVersions($params) {
+		$rel_path =  $params[OC_Filesystem::signal_param_path];
+		$abs_path = \OCP\Config::getSystemValue('datadirectory').'/'.\OC_User::getUser()."/versions".$rel_path;
+		if(OCA_Versions\Storage::isversioned($rel_path)) {
+			$versions = OCA_Versions\Storage::getVersions($rel_path);
+			foreach ($versions as $v){
+					unlink($abs_path.'.v' . $v['version']);
+			}
+		}
+	}
+}
+
+?>
\ No newline at end of file