diff --git a/scanner.c b/scanner.c
index 54eeef9..eabd284 100644
--- a/scanner.c
+++ b/scanner.c
@@ -21,6 +21,7 @@
 #include <unistd.h>
 #include <dirent.h>
 #include <locale.h>
+#include <libgen.h>
 #include <sys/stat.h>
 
 #include <sqlite3.h>
@@ -536,7 +537,7 @@ ScanDirectory(const char * dir, const char * parent)
 		free(namelist[i]);
 	}
 	free(namelist);
-	chdir("..");
+	chdir(dirname((char*)dir));
 	if( !parent )
 	{
 		printf("Scanning \"%s\" finished!\n", dir);