diff --git a/TODO b/TODO
index 07c0525e1..42b8cb9db 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,5 @@
 TODO list:
   - check downgrades (*)
-  - remove linux-sabayon-modules dependency from sys-kernel/linux-sabayon (* - repackage needed)
   - migrate server code to ServerInterface
   - Community repositories
   - find a way to better handle real smartapps deps (need split PDEPEND?)
diff --git a/libraries/entropy.py b/libraries/entropy.py
index ca74c40f3..63591123c 100644
--- a/libraries/entropy.py
+++ b/libraries/entropy.py
@@ -4290,7 +4290,8 @@ class urlFetcher:
 
     def encodeUrl(self, url):
         import urllib
-        return urllib.quote(url)
+        url = os.path.join(os.path.dirname(url),urllib.quote(os.path.basename(url)))
+        return url
 
     def download(self):
         if self.showSpeed: