diff --git a/features/net/FEATURE_IPV6/nanostack-interface/NanostackInterface.cpp b/features/net/FEATURE_IPV6/nanostack-interface/NanostackInterface.cpp
index 23dbc886ba..9cd5688c42 100644
--- a/features/net/FEATURE_IPV6/nanostack-interface/NanostackInterface.cpp
+++ b/features/net/FEATURE_IPV6/nanostack-interface/NanostackInterface.cpp
@@ -846,7 +846,7 @@ int NanostackInterface::socket_connect(void *handle, const SocketAddress &addr)
     return ret;
 }
 
-int NanostackInterface::socket_accept(void **handle, void *server)
+int NanostackInterface::socket_accept(void *server, void **handle, SocketAddress *address)
 {
     return NSAPI_ERROR_UNSUPPORTED;
 }
diff --git a/features/net/FEATURE_IPV6/nanostack-interface/NanostackInterface.h b/features/net/FEATURE_IPV6/nanostack-interface/NanostackInterface.h
index e9560070de..47126c4a1f 100644
--- a/features/net/FEATURE_IPV6/nanostack-interface/NanostackInterface.h
+++ b/features/net/FEATURE_IPV6/nanostack-interface/NanostackInterface.h
@@ -95,11 +95,12 @@ protected:
      *  This call is non-blocking. If accept would block,
      *  NSAPI_ERROR_WOULD_BLOCK is returned immediately.
      *
-     *  @param handle   Destination for a handle to the newly created sockey
      *  @param server   Socket handle to server to accept from
+     *  @param handle   Destination for a handle to the newly created socket
+     *  @param address  Destination for the remote address or NULL
      *  @return         0 on success, negative error code on failure
      */
-    virtual int socket_accept(void **handle, void *server);
+    virtual int socket_accept(void *handle, void **server, SocketAddress *address);
 
     /** Send data over a TCP socket
      *