diff --git a/rhizome.h b/rhizome.h
index 3cde89dc..04a5ed18 100644
--- a/rhizome.h
+++ b/rhizome.h
@@ -262,3 +262,4 @@ int rhizome_ignore_manifest_check(rhizome_manifest *m,
 
 int rhizome_suggest_queue_manifest_import(rhizome_manifest *m,
 					  struct sockaddr_in *peerip);
+int rhizome_enqueue_suggestions();
diff --git a/rhizome_fetch.c b/rhizome_fetch.c
index 9d5dc2eb..46e6a0fd 100644
--- a/rhizome_fetch.c
+++ b/rhizome_fetch.c
@@ -301,6 +301,7 @@ int rhizome_queue_ignore_manifest(rhizome_manifest *m,
 
 typedef struct rhizome_candidates {
   rhizome_manifest *manifest;
+  struct sockaddr_in peer;
   long long size;
   /* XXX Need group memberships/priority level here */
   int priority;
@@ -353,7 +354,7 @@ int rhizome_suggest_queue_manifest_import(rhizome_manifest *m,
   int priority=100; /* normal priority */
   int i;
 
-  WHYF("Rhizome considering %s (size=%lld, priority=%d)",
+  if (0) WHYF("Rhizome considering %s (size=%lld, priority=%d)",
        id,filesize,priority);
 
   if (rhizome_manifest_version_cache_lookup(m)) {
@@ -367,7 +368,7 @@ int rhizome_suggest_queue_manifest_import(rhizome_manifest *m,
     rhizome_manifest_free(m);
     return -1;
   } else {
-    if (1||debug&DEBUG_RHIZOMESYNC) {
+    if (debug&DEBUG_RHIZOMESYNC) {
       WHYF("manifest id=%s, version=%lld is new to us.\n",
 	   rhizome_manifest_get(m,"id",NULL,0),
 	   rhizome_manifest_get_ll(m,"version"));
@@ -434,6 +435,7 @@ int rhizome_suggest_queue_manifest_import(rhizome_manifest *m,
   candidates[i].manifest=m;
   candidates[i].size=filesize;
   candidates[i].priority=priority;
+  candidates[i].peer=*peerip;
 
   int j;
   WHY("Rhizome priorities fetch list now:");
@@ -446,6 +448,28 @@ int rhizome_suggest_queue_manifest_import(rhizome_manifest *m,
   return 0;
 }
 
+int rhizome_enqueue_suggestions()
+{
+  int i;
+  for(i=0;i<candidate_count;i++)
+    {
+      if (rhizome_file_fetch_queue_count>=MAX_QUEUED_FILES) 
+	break;
+      rhizome_queue_manifest_import(candidates[i].manifest,&candidates[i].peer);
+      candidates[i].manifest=NULL;
+    }
+  if (i) {
+    /* now shuffle up */
+    int bytes=(candidate_count-i)*sizeof(rhizome_candidates);
+    WHYF("Moving slot %d to slot 0 (%d bytes = %d slots)",
+	 i,bytes,bytes/sizeof(rhizome_candidates));
+    bcopy(&candidates[i],&candidates[0],bytes);
+    candidate_count-=i;
+  }
+
+  return 0;
+}
+
 int rhizome_queue_manifest_import(rhizome_manifest *m,
 				  struct sockaddr_in *peerip)
 {
@@ -685,10 +709,19 @@ int rhizome_fetching_get_fds(struct pollfd *fds,int *fdcount,int fdmax)
    return 0;
 }
 
+long long rhizome_last_fetch_enqueue_time=0;
+
 int rhizome_fetch_poll()
 {
   int rn;
   if (!rhizome_poll_fetchP) return 0;
+
+  if (rhizome_last_fetch_enqueue_time<overlay_gettime_ms())
+    {
+      rhizome_enqueue_suggestions();
+      rhizome_last_fetch_enqueue_time=overlay_gettime_ms();
+    }
+
   if (0&&debug&DEBUG_RHIZOME) WHYF("Checking %d active fetch requests",
 				rhizome_file_fetch_queue_count);
   for(rn=0;rn<rhizome_file_fetch_queue_count;rn++)
diff --git a/rhizome_packetformats.c b/rhizome_packetformats.c
index 62f9f234..18383322 100644
--- a/rhizome_packetformats.c
+++ b/rhizome_packetformats.c
@@ -393,7 +393,7 @@ int overlay_rhizome_saw_advertisements(int i,overlay_frame *f, long long now)
 	    
 	    /* Add manifest to import queue. We need to know originating IPv4 address
 	       so that we can transfer by HTTP. */
-	    WHY("Suggesting fetching of a bundle");
+	    if (0) WHY("Suggesting fetching of a bundle");
 	    rhizome_suggest_queue_manifest_import
 	      (m,(struct sockaddr_in *)f->recvaddr);	  
 	  }