diff --git a/src/ip6-manager/nm-ip6-manager.c b/src/ip6-manager/nm-ip6-manager.c
index 61cf5be218..ca532e3e93 100644
--- a/src/ip6-manager/nm-ip6-manager.c
+++ b/src/ip6-manager/nm-ip6-manager.c
@@ -33,7 +33,7 @@
 #include "nm-system.h"
 
 /* Pre-DHCP addrconf timeout, in seconds */
-#define NM_IP6_TIMEOUT 10
+#define NM_IP6_TIMEOUT 20
 
 /* FIXME? Stolen from the kernel sources */
 #define IF_RA_OTHERCONF 0x80