diff --git a/apps/gallery/lib/hooks_handlers.php b/apps/gallery/lib/hooks_handlers.php
index 53a924ff40..236a4b96a0 100644
--- a/apps/gallery/lib/hooks_handlers.php
+++ b/apps/gallery/lib/hooks_handlers.php
@@ -63,21 +63,8 @@ class OC_Gallery_Hooks_Handlers {
 
     if (!self::isPhoto($fullpath)) return;
 
-    OC_Log::write(self::$APP_TAG, 'Adding file with path '. $fullpath, OC_Log::DEBUG);
     $path = substr($fullpath, 0, strrpos($fullpath, '/'));
-    if ($path == '') $path = '/';
-    $album = OC_Gallery_Album::find(OC_User::getUser(), null, $path);
-
-    if ($album->numRows() == 0) {
-      $album = self::createAlbum($path);
-    }
-    $album = $album->fetchRow();
-    $albumId = $album['album_id'];
-    $photo = OC_Gallery_Photo::find($albumId, $fullpath);
-    if ($photo->numRows() == 0) { // don't duplicate photo entries
-      OC_Log::write(self::$APP_TAG, 'Adding new photo to album', OC_Log::DEBUG);
-      OC_Gallery_Photo::create($albumId, $fullpath);
-    }
+    OC_Gallery_Scanner::scanDir($path, $albums);
 
   }
 
@@ -85,6 +72,7 @@ class OC_Gallery_Hooks_Handlers {
     $path = $params[OC_Filesystem::signal_param_path];
     if (OC_Filesystem::is_dir($path) && self::directoryContainsPhotos($path)) {
       OC_Gallery_Album::removeByPath($path, OC_User::getUser());
+      OC_Gallery_Photo::removeByPath($path.'/%');
     } elseif (self::isPhoto($path)) {
       OC_Gallery_Photo::removeByPath($path);
     }
diff --git a/apps/gallery/lib/images_utils.php b/apps/gallery/lib/images_utils.php
index 0cfa52eb56..126298913b 100644
--- a/apps/gallery/lib/images_utils.php
+++ b/apps/gallery/lib/images_utils.php
@@ -21,7 +21,11 @@
 * 
 */
 
-require_once('../../../lib/base.php');
+if (file_exists('../../../lib/base.php'))
+  require_once('../../../lib/base.php');
+elseif (file_exists('lib/base.php'))
+  require_once('lib/base.php');
+
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('gallery');
 
diff --git a/apps/gallery/lib/photo.php b/apps/gallery/lib/photo.php
index 14b0c4b2a0..d1fb166aee 100644
--- a/apps/gallery/lib/photo.php
+++ b/apps/gallery/lib/photo.php
@@ -47,7 +47,7 @@ class OC_Gallery_Photo{
 	}
 
   public static function removeByPath($path) {
-    $stmt = OC_DB::prepare('DELETE FROM *PREFIX*gallery_photos WHERE file_path = ?');
+    $stmt = OC_DB::prepare('DELETE FROM *PREFIX*gallery_photos WHERE file_path LIKE ?');
     $stmt->execute(array($path));
   }