diff --git a/sau/gentoo.py b/sau/gentoo.py
index 9af747f..6c4028e 100644
--- a/sau/gentoo.py
+++ b/sau/gentoo.py
@@ -194,7 +194,7 @@ def pkg_upgrade():
 
     ## Query upgradeable packages
     cmd = [ EMERGE_PATH, '--color', 'n', '-uDNpq', '--with-bdeps=y', '@world' ]
-    ret, out, err = sau.helpers.exec_cmd(cmd)
+    ret, out, err = sau.helpers.exec_cmd(cmd, timeout=3600)
 
     if not ret == 0:
         log.error('emerge pretend returned {}'.format(ret))
@@ -315,7 +315,7 @@ def pkg_upgrade():
 
         # rebuild live packages
         cmd = [ EMERGE_PATH, '--color', 'n', '-q', '--usepkg', 'n', '@live-rebuild' ]
-        ret, out, err = sau.helpers.exec_cmd(cmd, timeout=3600)
+        ret, out, err = sau.helpers.exec_cmd(cmd, timeout=72000)
         if ret != 0 or err:
             log.error('live-rebuild returned {}'.format(ret))
             for line in out.splitlines():