diff --git a/source/org/jivesoftware/smack/PacketReader.java b/source/org/jivesoftware/smack/PacketReader.java
index 08dfb37af..46d87c90a 100644
--- a/source/org/jivesoftware/smack/PacketReader.java
+++ b/source/org/jivesoftware/smack/PacketReader.java
@@ -180,11 +180,11 @@ class PacketReader {
     public void startup() throws XMPPException {
         readerThread.start();
         listenerThread.start();
-        // Wait for stream tag before returing. We'll wait a maximum of five seconds before
+        // Wait for stream tag before returing. We'll wait a couple of seconds before
         // giving up and throwing an error.
         try {
             synchronized(connectionIDLock) {
-                connectionIDLock.wait(5000);
+                connectionIDLock.wait(SmackConfiguration.getPacketReplyTimeout());
             }
         }
         catch (InterruptedException ie) { }