diff --git a/src/seeder/bitcoin.h b/src/seeder/bitcoin.h
--- a/src/seeder/bitcoin.h
+++ b/src/seeder/bitcoin.h
@@ -20,6 +20,14 @@
 // message.
 static const unsigned int ADDR_SOFT_CAP = 1000;
 
+// TODO: Pull in AVG_ADDRESS_BROADCAST_INTERVAL form net_processing if possible
+// and when there are fewer dependencies
+/**
+ * This constant must be AVG_ADDRESS_BROADCAST_INTERVAL + <margin of error for
+ * network latency>.
+ */
+static const unsigned int CONNECTION_TIMEOUT = 30 + 15;
+
 // The network magic to use.
 extern CMessageHeader::MessageMagic netMagic;
 
@@ -43,7 +51,7 @@
     int64_t doneAfter;
     CAddress you;
 
-    int GetTimeout() { return you.IsTor() ? 120 : 30; }
+    int GetTimeout() { return you.IsTor() ? 120 : CONNECTION_TIMEOUT; }
 
     void BeginMessage(const char *pszCommand);