diff --git a/discover/common.go b/discover/common.go
index d8d866a..b465ca8 100644
--- a/discover/common.go
+++ b/discover/common.go
@@ -25,7 +25,7 @@ import (
 	"github.com/ethereum/go-ethereum/p2p/enode"
 	"github.com/ethereum/go-ethereum/p2p/enr"
 	"github.com/ethereum/go-ethereum/p2p/netutil"
-	"github.com/status-im/go-discover/discover/v5wire"
+	"github.com/waku-org/go-discover/discover/v5wire"
 )
 
 // UDPConn is a network connection on which discovery can operate.
@@ -46,12 +46,13 @@ type Config struct {
 	PrivateKey *ecdsa.PrivateKey
 
 	// These settings are optional:
-	NetRestrict  *netutil.Netlist   // list of allowed IP networks
-	Bootnodes    []*enode.Node      // list of bootstrap nodes
-	Unhandled    chan<- ReadPacket  // unhandled packets are sent on this channel
-	Log          log.Logger         // if set, log messages go here
-	ValidSchemes enr.IdentityScheme // allowed identity schemes
-	V5Config     V5Config           // DiscV5 settings
+	NetRestrict  *netutil.Netlist      // list of allowed IP networks
+	Bootnodes    []*enode.Node         // list of bootstrap nodes
+	Unhandled    chan<- ReadPacket     // unhandled packets are sent on this channel
+	Log          log.Logger            // if set, log messages go here
+	ValidSchemes enr.IdentityScheme    // allowed identity schemes
+	V5Config     V5Config              // DiscV5 settings
+	ValidNodeFn  func(enode.Node) bool // function to validate a node before it's added to routing tables
 	Clock        mclock.Clock
 }
 
diff --git a/discover/v4_lookup_test.go b/discover/v4_lookup_test.go
index ebbbf61..3b51ad5 100644
--- a/discover/v4_lookup_test.go
+++ b/discover/v4_lookup_test.go
@@ -26,7 +26,7 @@ import (
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/p2p/enode"
 	"github.com/ethereum/go-ethereum/p2p/enr"
-	"github.com/status-im/go-discover/discover/v4wire"
+	"github.com/waku-org/go-discover/discover/v4wire"
 )
 
 func TestUDPv4_Lookup(t *testing.T) {
diff --git a/discover/v4_udp.go b/discover/v4_udp.go
index 97d7e45..00988c5 100644
--- a/discover/v4_udp.go
+++ b/discover/v4_udp.go
@@ -33,7 +33,7 @@ import (
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/p2p/enode"
 	"github.com/ethereum/go-ethereum/p2p/netutil"
-	"github.com/status-im/go-discover/discover/v4wire"
+	"github.com/waku-org/go-discover/discover/v4wire"
 )
 
 // Errors
diff --git a/discover/v4_udp_test.go b/discover/v4_udp_test.go
index 1c05712..bb6dc1c 100644
--- a/discover/v4_udp_test.go
+++ b/discover/v4_udp_test.go
@@ -34,8 +34,8 @@ import (
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/p2p/enode"
 	"github.com/ethereum/go-ethereum/p2p/enr"
-	"github.com/status-im/go-discover/discover/v4wire"
-	"github.com/status-im/go-discover/internal/testlog"
+	"github.com/waku-org/go-discover/discover/v4wire"
+	"github.com/waku-org/go-discover/internal/testlog"
 )
 
 // shared test variables
diff --git a/discover/v5_udp.go b/discover/v5_udp.go
index 2408066..d4e6a2e 100644
--- a/discover/v5_udp.go
+++ b/discover/v5_udp.go
@@ -34,7 +34,7 @@ import (
 	"github.com/ethereum/go-ethereum/p2p/enode"
 	"github.com/ethereum/go-ethereum/p2p/enr"
 	"github.com/ethereum/go-ethereum/p2p/netutil"
-	"github.com/status-im/go-discover/discover/v5wire"
+	"github.com/waku-org/go-discover/discover/v5wire"
 )
 
 const (
diff --git a/discover/v5_udp_test.go b/discover/v5_udp_test.go
index 1e62ce6..2261499 100644
--- a/discover/v5_udp_test.go
+++ b/discover/v5_udp_test.go
@@ -32,8 +32,8 @@ import (
 	"github.com/ethereum/go-ethereum/p2p/enode"
 	"github.com/ethereum/go-ethereum/p2p/enr"
 	"github.com/ethereum/go-ethereum/rlp"
-	"github.com/status-im/go-discover/discover/v5wire"
-	"github.com/status-im/go-discover/internal/testlog"
+	"github.com/waku-org/go-discover/discover/v5wire"
+	"github.com/waku-org/go-discover/internal/testlog"
 )
 
 // Real sockets, real crypto: this test checks end-to-end connectivity for UDPv5.
diff --git a/go.mod b/go.mod
index a9d2a42..62b7080 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/status-im/go-discover
+module github.com/waku-org/go-discover
 
 go 1.15