diff --git a/TODO b/TODO
index e283e1693..a394fc52f 100644
--- a/TODO
+++ b/TODO
@@ -4,6 +4,7 @@ TODO list:
   - migrate server code to ServerInterface
      [] write a tool that helps keeping packages updated (also supporting injected ones)
      [] complete reagent spm interface
+  - implement configuration files snapshot tool
   - packages.sabayonlinux.org interactivity (comments + images upload + connection to phpbb user db)
   - Community repositories
   - separate packages by license restrictions
diff --git a/libraries/entropy.py b/libraries/entropy.py
index 5cb5f7544..55454d774 100644
--- a/libraries/entropy.py
+++ b/libraries/entropy.py
@@ -1608,7 +1608,10 @@ class EquoInterface(TextInterface):
                     #matchatom = mdbconn.retrieveAtom(matchresults[0])
                     update.add(matchresults)
                 else:
-                    remove.add(idpackage)
+                    # don't take action if it's just masked
+                    maskedresults = self.atomMatch(myscopedata[1]+"/"+myscopedata[2], matchSlot = myscopedata[4], matchBranches = (branch,), packagesFilter = False)
+                    if maskedresults[0] == -1:
+                        remove.add(idpackage)
                     # look for packages that would match key with any slot (for eg, gcc updates), slot changes handling
                     matchresults = self.atomMatch(myscopedata[1]+"/"+myscopedata[2], matchBranches = (branch,))
                     if matchresults[0] != -1: