diff --git a/elements/ethernet/ip6ndsolicitor.cc b/elements/ethernet/ip6ndsolicitor.cc
index e421a763b..e9aecb6a8 100644
--- a/elements/ethernet/ip6ndsolicitor.cc
+++ b/elements/ethernet/ip6ndsolicitor.cc
@@ -181,7 +181,14 @@ IP6NDSolicitor::send_query_for(const u_char want_ip6[16])
   ea->checksum = htons(in6_fast_cksum(&ip6->ip6_src, &ip6->ip6_dst, ip6->ip6_plen, ip6->ip6_nxt, 0, (unsigned char *)(ip6+1), htons(sizeof(click_nd_sol))));
 
   _arp_queries++;
-  output(noutputs()-1).push(q);
+#if HAVE_BATCH
+  if (in_batch_mode) {
+    output_push_batch(noutputs()-1,PacketBatch::make_from_packet(q));
+  } else
+#endif
+  {
+    output(noutputs()-1).push(q);
+  }
 }
 
 /*
@@ -191,7 +198,7 @@ IP6NDSolicitor::send_query_for(const u_char want_ip6[16])
  * May save the packet in the NDEntry table for later sending.
  * May call p->kill().
  */
-void
+Packet*
 IP6NDSolicitor::handle_ip6(Packet *p)
 {
   IP6Address ipa = DST_IP6_ANNO(p);
@@ -212,11 +219,11 @@ IP6NDSolicitor::handle_ip6(Packet *p)
       memcpy(e->ether_shost, _my_en.data(), 6);
       memcpy(e->ether_dhost, ae->en.data(), 6);
       e->ether_type = htons(ETHERTYPE_IP6);
-      output(0).push(q);
+      return q;
     } else {
       if (ae->p) {
         ae->p->kill();
-	_pkts_killed++;
+        _pkts_killed++;
       }
       ae->p = p;
       send_query_for(DST_IP6_ANNO(p).data());
@@ -232,6 +239,7 @@ IP6NDSolicitor::handle_ip6(Packet *p)
 
     send_query_for(DST_IP6_ANNO(p).data());
   }
+  return 0;
 }
 
 /*
@@ -239,7 +247,7 @@ IP6NDSolicitor::handle_ip6(Packet *p)
  * Update our NDEntry table.
  * If there was a packet waiting to be sent, return it.
  */
-void
+Packet*
 IP6NDSolicitor::handle_response(Packet *p)
 {
   if (p->length() < sizeof(click_ether) + sizeof(click_ip6) + sizeof(click_nd_sol))
@@ -270,22 +278,48 @@ IP6NDSolicitor::handle_response(Packet *p)
       Packet *cached_packet = ae->p;
       ae->p = 0;
 
-      if (cached_packet){
-        handle_ip6(cached_packet);}
+      if (cached_packet) {
+        return handle_ip6(cached_packet);
+      }
     }
+    return 0;
 }
 
 void
 IP6NDSolicitor::push(int port, Packet *p)
 {
    if (port == 0){
-     handle_ip6(p); }
+     Packet* p = handle_ip6(p);
+     if (p)
+      output_push(0, p);
+    }
   else {
-    handle_response(p);
+    Packet* q = handle_response(p);
+    if (q)
+      output_push(0, q);
     p->kill();
   }
 }
 
+#if HAVE_BATCH
+void
+IP6NDSolicitor::push_batch(int port, PacketBatch *batch)
+{
+    auto fnt = [this,port](Packet* p) -> Packet* {
+      if (port == 0){
+          return handle_ip6(p);
+      } else {
+        Packet* q = handle_response(p);
+        p->kill();
+        return q;
+      }
+    };
+    EXECUTE_FOR_EACH_PACKET_DROPPABLE(fnt, batch);
+    if (batch)
+      output_push_batch(0, batch);
+}
+#endif
+
 String
 IP6NDSolicitor::read_table(Element *e, void *)
 {
diff --git a/elements/ethernet/ip6ndsolicitor.hh b/elements/ethernet/ip6ndsolicitor.hh
index b954a0dff..ae49877e7 100644
--- a/elements/ethernet/ip6ndsolicitor.hh
+++ b/elements/ethernet/ip6ndsolicitor.hh
@@ -1,6 +1,6 @@
 #ifndef CLICK_IP6NDSOLICITOR_HH
 #define CLICK_IP6NDSOLICITOR_HH
-#include <click/element.hh>
+#include <click/batchelement.hh>
 #include <click/etheraddress.hh>
 #include <click/ip6address.hh>
 #include <click/timer.hh>
@@ -47,7 +47,7 @@ CLICK_DECLS
  * IP6NDAdvertiser
  */
 
-class IP6NDSolicitor : public Element {
+class IP6NDSolicitor : public BatchElement {
  public:
 
   IP6NDSolicitor();
@@ -66,6 +66,9 @@ class IP6NDSolicitor : public Element {
   void take_state(Element *, ErrorHandler *);
 
   void push(int port, Packet *);
+#if HAVE_BATCH
+  void push_batch(int port, PacketBatch *);
+#endif
 
   Packet *make_query(unsigned char tpa[16],
                      unsigned char sha[6], unsigned char spa[16]);
@@ -96,8 +99,8 @@ class IP6NDSolicitor : public Element {
 
   void send_query_for(const u_char want_ip6[16]);
 
-  void handle_ip6(Packet *);
-  void handle_response(Packet *);
+  Packet* handle_ip6(Packet *);
+  Packet* handle_response(Packet *);
 
   enum { EXPIRE_TIMEOUT_MS = 15 * 1000 };
   static void expire_hook(Timer *, void *);