diff --git a/TODO b/TODO
index 8b1933947..2d4f7c56a 100644
--- a/TODO
+++ b/TODO
@@ -26,27 +26,3 @@ Features plan:
 - enzyme: distcc support on cross platforms and on automake
 - activator: add stable/ repository and the cron-aware module that moves files from the unstable/default repo to the stable one.
 - activator: add support for ssh (where supported) to we can md5sum the uploaded files?
-
-
-
-Have a look at if this is solved:
-Traceback (most recent call last):
-  File "activator", line 100, in ?
-    activatorTools.packages(options[1:])
-  File "../libraries/activatorTools.py", line 222, in packages
-    ftp.uploadFile(etpConst['packagessuploaddir']+"/"+item[0])
-  File "../libraries/entropyTools.py", line 852, in uploadFile
-    rc = self.ftpconn.storbinary("STOR "+file,f)
-  File "/usr/lib/python2.4/ftplib.py", line 421, in storbinary
-    return self.voidresp()
-  File "/usr/lib/python2.4/ftplib.py", line 221, in voidresp
-    resp = self.getresp()
-  File "/usr/lib/python2.4/ftplib.py", line 207, in getresp
-    resp = self.getmultiline()
-  File "/usr/lib/python2.4/ftplib.py", line 193, in getmultiline
-    line = self.getline()
-  File "/usr/lib/python2.4/ftplib.py", line 180, in getline
-    line = self.file.readline()
-  File "/usr/lib/python2.4/socket.py", line 332, in readline
-    data = self._sock.recv(self._rbufsize)
-socket.error: (104, 'Connection reset by peer')
diff --git a/libraries/entropyTools.py b/libraries/entropyTools.py
index 11bd4ec7d..24893b0bb 100644
--- a/libraries/entropyTools.py
+++ b/libraries/entropyTools.py
@@ -359,7 +359,19 @@ def emerge(atom, options, outfile = None, redirect = "&>", simulate = False):
 	    os.remove(outfile)
 	except:
 	    spawnCommand("rm -rf "+outfile)
-    
+
+    # Get specified USE flags
+    try:
+	useflags = " USE='"+os.environ['USE']+"' "
+    except:
+	useflags = " "
+
+    # Get specified MAKEOPTS
+    try:
+	makeopts = " MAKEOPTS='"+os.environ['MAKEOPTS']+"' "
+    except:
+	makeopts = " "
+
     # elog configuration
     elogopts = dbPORTAGE_ELOG_OPTS+" "
     # clean elog shit
@@ -377,7 +389,7 @@ def emerge(atom, options, outfile = None, redirect = "&>", simulate = False):
 	distccjobs = str(len(getDistCCHosts())+3)
 	distccopts += 'MAKEOPTS="-j'+distccjobs+'" '
 	#distccopts += 'MAKEOPTS="-j4" '
-    rc = spawnCommand(distccopts+elogopts+cdbRunEmerge+" "+options+" "+atom, redirect+outfile)
+    rc = spawnCommand(distccopts+useflags+makeopts+elogopts+cdbRunEmerge+" "+options+" "+atom, redirect+outfile)
     return rc, outfile
 
 def parseElogFile(atom):