diff --git a/TODO b/TODO
index 2366061dd..3124922d5 100644
--- a/TODO
+++ b/TODO
@@ -5,6 +5,7 @@ TODO list:
     - enable/disable it
     - purge function
   - remove binkeywords, not used
+  - move etpConst['branches'] to config files
   - add external trigger for splashutils
   - find a way to better handle real smartapps deps
   - reduce size of packages.db.bz2
diff --git a/libraries/activatorTools.py b/libraries/activatorTools.py
index cc01cd792..745457d47 100644
--- a/libraries/activatorTools.py
+++ b/libraries/activatorTools.py
@@ -245,7 +245,15 @@ def packages(options):
 	    
 	            print_info(green(" * ")+yellow("Fetching remote statistics..."), back = True)
 	            ftp = mirrorTools.handlerFTP(uri)
-		    ftp.setCWD(etpConst['binaryurirelativepath'])
+                    try:
+                        ftp.setCWD(etpConst['binaryurirelativepath'])
+                    except:
+                        bdir = ""
+                        for mydir in etpConst['binaryurirelativepath'].split("/"):
+                            bdir += "/"+mydir
+                            ftp.mkdir(bdir)
+                        ftp.setCWD(etpConst['binaryurirelativepath'])
+
 		    if (not ftp.isFileAvailable(mybranch)):
 			ftp.mkdir(mybranch)
 	            ftp.setCWD(mybranch)
diff --git a/libraries/entropyConstants.py b/libraries/entropyConstants.py
index 82c7ff5db..8f1f1be36 100644
--- a/libraries/entropyConstants.py
+++ b/libraries/entropyConstants.py
@@ -404,7 +404,7 @@ etpConst = {
     'currentarch': ETP_ARCH_CONST, # contains the current running architecture
     'supportedarchs': ETP_ARCHS, # Entropy supported Archs
     
-    'branches': ["3.5","2008"], # available branches, this only exists for the server part
+    'branches': ["3.5","2008"], # available branches, this only exists for the server part FIXME: move them to server config files
     'branch': "3.5", # choosen branch
     'keywords': set([ETP_ARCH_CONST,"~"+ETP_ARCH_CONST]), # default allowed package keywords
     'gentoo-compat': False, # Gentoo compatibility (/var/db/pkg + Portage availability)