diff --git a/src/applications/packet-sink/packet-sink.cc b/src/applications/packet-sink/packet-sink.cc
index 97283c722..507a0c371 100644
--- a/src/applications/packet-sink/packet-sink.cc
+++ b/src/applications/packet-sink/packet-sink.cc
@@ -87,7 +87,7 @@ void PacketSink::StartApplication()    // Called at time specified by Start
     {
       m_socket = Socket::CreateSocket (GetNode(), m_tid);
       m_socket->Bind (m_local);
-      m_socket->Listen (0);
+      m_socket->Listen ();
     }
 
   m_socket->SetRecvCallback (MakeCallback(&PacketSink::HandleRead, this));
diff --git a/src/internet-stack/nsc-tcp-socket-impl.cc b/src/internet-stack/nsc-tcp-socket-impl.cc
index 3023f49d2..e3020d630 100644
--- a/src/internet-stack/nsc-tcp-socket-impl.cc
+++ b/src/internet-stack/nsc-tcp-socket-impl.cc
@@ -395,9 +395,9 @@ NscTcpSocketImpl::GetTxAvailable (void) const
 }
 
 int
-NscTcpSocketImpl::Listen (uint32_t q)
+NscTcpSocketImpl::Listen (void)
 {
-  NS_LOG_FUNCTION (this << q);
+  NS_LOG_FUNCTION (this);
   m_nscTcpSocket->listen(m_localPort);
   m_state = LISTEN;
   return 0;
diff --git a/src/internet-stack/nsc-tcp-socket-impl.h b/src/internet-stack/nsc-tcp-socket-impl.h
index 61689f88a..cc0c8e684 100644
--- a/src/internet-stack/nsc-tcp-socket-impl.h
+++ b/src/internet-stack/nsc-tcp-socket-impl.h
@@ -73,7 +73,7 @@ public:
   virtual int ShutdownSend (void);
   virtual int ShutdownRecv (void);
   virtual int Connect(const Address &address);
-  virtual int Listen(uint32_t queueLimit);
+  virtual int Listen(void);
   virtual uint32_t GetTxAvailable (void) const;
   virtual int Send (Ptr<Packet> p, uint32_t flags);
   virtual int SendTo(Ptr<Packet> p, uint32_t flags, const Address &toAddress);
diff --git a/src/internet-stack/tcp-socket-impl.cc b/src/internet-stack/tcp-socket-impl.cc
index d9deccc1b..35184ff00 100644
--- a/src/internet-stack/tcp-socket-impl.cc
+++ b/src/internet-stack/tcp-socket-impl.cc
@@ -454,9 +454,9 @@ TcpSocketImpl::GetTxAvailable (void) const
 }
 
 int
-TcpSocketImpl::Listen (uint32_t q)
+TcpSocketImpl::Listen (void)
 {
-  NS_LOG_FUNCTION (this << q);
+  NS_LOG_FUNCTION (this);
   Actions_t action = ProcessEvent (APP_LISTEN);
   ProcessAction (action);
   return 0;
@@ -1915,7 +1915,7 @@ TcpSocketImplTest::SetupDefaultSim ()
   InetSocketAddress serverremoteaddr (Ipv4Address(ipaddr0), port);
 
   listeningSock->Bind(serverlocaladdr);
-  listeningSock->Listen (0);
+  listeningSock->Listen ();
 
   sock1->Connect(serverremoteaddr);
 }
diff --git a/src/internet-stack/tcp-socket-impl.h b/src/internet-stack/tcp-socket-impl.h
index 123d588ec..8298cc84a 100644
--- a/src/internet-stack/tcp-socket-impl.h
+++ b/src/internet-stack/tcp-socket-impl.h
@@ -86,7 +86,7 @@ public:
   virtual int ShutdownSend (void);
   virtual int ShutdownRecv (void);
   virtual int Connect(const Address &address);
-  virtual int Listen(uint32_t queueLimit);
+  virtual int Listen(void);
   virtual uint32_t GetTxAvailable (void) const;
   virtual int Send (Ptr<Packet> p, uint32_t flags);
   virtual int SendTo(Ptr<Packet> p, uint32_t flags, const Address &toAddress);
diff --git a/src/internet-stack/udp-socket-impl.cc b/src/internet-stack/udp-socket-impl.cc
index 939e1984f..164a1b2c0 100644
--- a/src/internet-stack/udp-socket-impl.cc
+++ b/src/internet-stack/udp-socket-impl.cc
@@ -216,7 +216,7 @@ UdpSocketImpl::Connect(const Address & address)
 }
 
 int 
-UdpSocketImpl::Listen (uint32_t queueLimit)
+UdpSocketImpl::Listen (void)
 {
   m_errno = Socket::ERROR_OPNOTSUPP;
   return -1;
diff --git a/src/internet-stack/udp-socket-impl.h b/src/internet-stack/udp-socket-impl.h
index 31f0f8bc7..0a20a384f 100644
--- a/src/internet-stack/udp-socket-impl.h
+++ b/src/internet-stack/udp-socket-impl.h
@@ -65,7 +65,7 @@ public:
   virtual int ShutdownSend (void);
   virtual int ShutdownRecv (void);
   virtual int Connect(const Address &address);
-  virtual int Listen (uint32_t queueLimit);
+  virtual int Listen (void);
   virtual uint32_t GetTxAvailable (void) const;
   virtual int Send (Ptr<Packet> p, uint32_t flags);
   virtual int SendTo (Ptr<Packet> p, uint32_t flags, const Address &address);
diff --git a/src/node/packet-socket.cc b/src/node/packet-socket.cc
index 59cabb99d..cc66fd950 100644
--- a/src/node/packet-socket.cc
+++ b/src/node/packet-socket.cc
@@ -222,7 +222,7 @@ PacketSocket::Connect(const Address &ad)
   return -1;
 }
 int 
-PacketSocket::Listen(uint32_t queueLimit)
+PacketSocket::Listen(void)
 {
   m_errno = Socket::ERROR_OPNOTSUPP;
   return -1;
diff --git a/src/node/packet-socket.h b/src/node/packet-socket.h
index 1218de2c3..a0db81040 100644
--- a/src/node/packet-socket.h
+++ b/src/node/packet-socket.h
@@ -93,7 +93,7 @@ public:
   virtual int ShutdownSend (void);
   virtual int ShutdownRecv (void);
   virtual int Connect(const Address &address);
-  virtual int Listen(uint32_t queueLimit);
+  virtual int Listen(void);
   virtual uint32_t GetTxAvailable (void) const;
   virtual int Send (Ptr<Packet> p, uint32_t flags);
   virtual int SendTo(Ptr<Packet> p, uint32_t flags, const Address &toAddress);
diff --git a/src/node/socket.cc b/src/node/socket.cc
index d133e936f..7d1e7a147 100644
--- a/src/node/socket.cc
+++ b/src/node/socket.cc
@@ -100,12 +100,6 @@ Socket::Send (Ptr<Packet> p)
   return Send (p, 0);
 }
 
-
-int Socket::Listen (uint32_t queueLimit)
-{
-  return 0; //XXX the base class version does nothing
-}
-
 int 
 Socket::Send (const uint8_t* buf, uint32_t size, uint32_t flags)
 {
diff --git a/src/node/socket.h b/src/node/socket.h
index 36e1773b4..e05740753 100644
--- a/src/node/socket.h
+++ b/src/node/socket.h
@@ -222,7 +222,7 @@ public:
    * \param queueLimit maximum number of incoming request to queue
    * \returns 0 on success, -1 on error (in which case errno is set).
    */
-  virtual int Listen (uint32_t queueLimit) = 0;
+  virtual int Listen (void) = 0;
 
   /**
    * \brief Returns the number of bytes which can be sent in a single call