diff --git a/clc/modules/core/src/edu/ucsb/eucalyptus/util/ReplyCoordinator.java b/clc/modules/core/src/edu/ucsb/eucalyptus/util/ReplyCoordinator.java
index 0f23b369b62..5afa0a644a1 100644
--- a/clc/modules/core/src/edu/ucsb/eucalyptus/util/ReplyCoordinator.java
+++ b/clc/modules/core/src/edu/ucsb/eucalyptus/util/ReplyCoordinator.java
@@ -48,15 +48,22 @@ public class ReplyCoordinator {
   private static float MAP_BIN_AVG_THRESHOLD = 1.0f;
   private static long MAP_GET_WAIT_MS = 10;
   private static long MAP_SUBMIT_SLEEP_MS = MAP_GET_WAIT_MS;
-  private static long MAP_TIMEOUT_MS = 15000;
+  private long MAP_TIMEOUT_MS = 15000;
   private ConcurrentHashMap<String, EucalyptusMessage> replyMap;
   private ConcurrentHashMap<String,String> waitList;
 
   public ReplyCoordinator()
   {
+    this.MAP_TIMEOUT_MS = 15000;
     this.replyMap = new ConcurrentHashMap<String, EucalyptusMessage>( MAP_CAPACITY, MAP_BIN_AVG_THRESHOLD, MAP_NUM_CONCURRENT );
     this.waitList = new ConcurrentHashMap<String, String>( MAP_CAPACITY, MAP_BIN_AVG_THRESHOLD, MAP_NUM_CONCURRENT );
   }
+  public ReplyCoordinator( long user_timeout )
+  {
+    this();
+    this.MAP_TIMEOUT_MS = user_timeout;
+  }
+
 
   public void putMessage( EucalyptusMessage msg )
   {
diff --git a/clc/modules/interface/src/edu/ucsb/eucalyptus/ic/StorageReplyQueue.java b/clc/modules/interface/src/edu/ucsb/eucalyptus/ic/StorageReplyQueue.java
index 2b953a1010c..84b2b9ec82d 100644
--- a/clc/modules/interface/src/edu/ucsb/eucalyptus/ic/StorageReplyQueue.java
+++ b/clc/modules/interface/src/edu/ucsb/eucalyptus/ic/StorageReplyQueue.java
@@ -48,7 +48,7 @@ public class StorageReplyQueue {
 
     private static Logger LOG = Logger.getLogger( StorageReplyQueue.class );
 
-    private static ReplyCoordinator replies = new ReplyCoordinator();
+    private static ReplyCoordinator replies = new ReplyCoordinator( 3600000 );
 
     public void handle( EucalyptusMessage msg )
     {
diff --git a/clc/modules/interface/src/edu/ucsb/eucalyptus/ic/WalrusReplyQueue.java b/clc/modules/interface/src/edu/ucsb/eucalyptus/ic/WalrusReplyQueue.java
index 72375b216c9..fc3b109c4c0 100644
--- a/clc/modules/interface/src/edu/ucsb/eucalyptus/ic/WalrusReplyQueue.java
+++ b/clc/modules/interface/src/edu/ucsb/eucalyptus/ic/WalrusReplyQueue.java
@@ -55,7 +55,7 @@ public class WalrusReplyQueue {
 
     private static Logger LOG = Logger.getLogger( WalrusReplyQueue.class );
 
-    private static ReplyCoordinator replies = new ReplyCoordinator();
+    private static ReplyCoordinator replies = new ReplyCoordinator( 3600000 );
 
     private static int SC_DECRYPTION_FAILED = 566;
     public void handle( EucalyptusMessage msg )