diff --git a/src/file.c b/src/file.c
index 8b88fce5..322891b1 100644
--- a/src/file.c
+++ b/src/file.c
@@ -80,7 +80,7 @@ file_add_support_directory_recursive                   (const gchar     *directo
 				    G_DIR_SEPARATOR_S, file);
 
 	if(g_file_test(fullpath, G_FILE_TEST_IS_DIR))
-	    file_add_support_directory_recursive(fullpath);
+	    file_add_support_directory_recursive(fullpath);            
     
 	g_free(fullpath);
     }
diff --git a/src/main.c b/src/main.c
index 77b7c252..16c43a8c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -144,7 +144,9 @@ main_parse_cl_arguments(gint *argc, gchar ***argv)
 
     if(support_dir != NULL)
     {
-	gchar *fullpath = g_path_get_dirname(support_dir);
+	gchar *fullpath = (support_dir[strlen(support_dir)] == G_DIR_SEPARATOR) ?
+            g_path_get_dirname(support_dir) :
+            g_strdup_printf("%s%s", support_dir, G_DIR_SEPARATOR_S);
 	file_add_support_directory_recursive(fullpath);
 	g_free(fullpath);
 	g_free(support_dir);