diff --git a/pisi/build.py b/pisi/build.py
index b39b9c03..b40aa882 100644
--- a/pisi/build.py
+++ b/pisi/build.py
@@ -322,6 +322,37 @@ class Builder:
         self.run_action_function(ctx.const.install_func, True)
         self.set_state("installaction")
 
+    def check_abandoned_files(self):
+        # show the files those are not collected from the install dir
+
+        install_dir = self.pkg_dir() + ctx.const.install_dir_suffix
+        abandoned_files = []
+        all_paths_in_packages = []
+
+        for package in self.spec.packages:
+            for path in package.files:
+                all_paths_in_packages.append(util.join_path(install_dir + path.path))
+
+        for root, dirs, files in os.walk(install_dir):
+            for file_ in files:
+                already_in_package = False
+                fpath = util.join_path(root, file_)
+                for path in all_paths_in_packages:
+                    if not fpath.find(path):
+                        already_in_package = True
+                if not already_in_package:
+                    abandoned_files.append(fpath)
+
+        if abandoned_files:
+            ctx.ui.warning(_('Abandoned files under the install dir (%s):' \
+                                                            % (install_dir)))
+            for f in abandoned_files:
+                ctx.ui.info('    - %s' % (f))
+        else:
+            ctx.ui.info(_('All of the files under the install dir (%s) has been collected by package(s)' \
+                                                            % (install_dir)))
+
+
     def compile_action_script(self):
         """Compiles actions.py and sets the actionLocals and actionGlobals"""
         scriptfile = util.join_path(self.specdir, ctx.const.actions_file)
@@ -686,7 +717,12 @@ class Builder:
             os.chdir(c)
             self.set_state("buildpackages")
             ctx.ui.info(_("Done."))
-           
+
+        #show the files those are not collected from the install dir
+        if ctx.get_option('show_abandoned_files') or ctx.get_option('debug'):
+            self.check_abandoned_files()
+            
+
         if ctx.config.values.general.autoclean is True:
             ctx.ui.info(_("Cleaning Build Directory..."))
             util.clean_dir(self.pkg_dir())
diff --git a/pisi/cli/commands.py b/pisi/cli/commands.py
index 71610dc4..f1401898 100644
--- a/pisi/cli/commands.py
+++ b/pisi/cli/commands.py
@@ -310,6 +310,11 @@ def buildno_opts(self):
                            default=False,
                            help=_("do not take build no into account."))
 
+def abandoned_files_opt(self):
+    self.parser.add_option("", "--show-abandoned-files", action="store_true",
+                           default=False,
+                           help=_("show abandoned files under the install directory after build."))
+
 def ignoredep_opt(self):
     p = self.parser
     p.add_option("-E", "--ignore-dependency", action="store_true",
@@ -338,6 +343,7 @@ to be downloaded from a repository containing sources.
 
     def options(self):
         buildno_opts(self)
+        abandoned_files_opt(self)
         ignoredep_opt(self)
         self.parser.add_option("-O", "--output-dir", action="store", default=None,
                                help=_("output directory for produced packages"))
@@ -347,12 +353,13 @@ to be downloaded from a repository containing sources.
         self.parser.add_option("-B", "--ignore-comar", action="store_true",
                                default=False, help=_("bypass comar configuration agent"))
 
+
     def run(self):
         if not self.args:
             self.help()
             return
 
-        self.init(database = True)
+        self.init(database = True) 
         if ctx.get_option('output_dir'):
             ctx.ui.info(_('Output directory: %s') % ctx.config.options.output_dir)
         else: