diff --git a/annotate/change.go b/annotate/change.go
index 072ddf7..a011676 100644
--- a/annotate/change.go
+++ b/annotate/change.go
@@ -3,8 +3,8 @@ package annotate
 import (
 	"context"
 
-	"github.com/onXmaps/osm"
-	"github.com/onXmaps/osm/annotate/internal/core"
+	"github.com/paulmach/osm"
+	"github.com/paulmach/osm/annotate/internal/core"
 )
 
 // Change will annotate a change into a diff. It will use the
diff --git a/annotate/change_test.go b/annotate/change_test.go
index d8d9b66..5706b58 100644
--- a/annotate/change_test.go
+++ b/annotate/change_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/onXmaps/osm"
+	"github.com/paulmach/osm"
 )
 
 func TestChange_create(t *testing.T) {
diff --git a/annotate/datasource.go b/annotate/datasource.go
index 62b3c1b..41102f9 100644
--- a/annotate/datasource.go
+++ b/annotate/datasource.go
@@ -3,9 +3,9 @@ package annotate
 import (
 	"context"
 
-	"github.com/onXmaps/osm"
-	"github.com/onXmaps/osm/annotate/internal/core"
-	"github.com/onXmaps/osm/annotate/shared"
+	"github.com/paulmach/osm"
+	"github.com/paulmach/osm/annotate/internal/core"
+	"github.com/paulmach/osm/annotate/shared"
 
 	"github.com/paulmach/orb"
 	"github.com/paulmach/orb/planar"
diff --git a/annotate/edgecases_test.go b/annotate/edgecases_test.go
index 8367d06..09c1310 100644
--- a/annotate/edgecases_test.go
+++ b/annotate/edgecases_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/onXmaps/osm"
+	"github.com/paulmach/osm"
 )
 
 func TestEdgeCase_childCreatedAfterParent(t *testing.T) {
diff --git a/annotate/errors.go b/annotate/errors.go
index 3ce809e..13a7d08 100644
--- a/annotate/errors.go
+++ b/annotate/errors.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/onXmaps/osm"
-	"github.com/onXmaps/osm/annotate/internal/core"
+	"github.com/paulmach/osm"
+	"github.com/paulmach/osm/annotate/internal/core"
 )
 
 // NoHistoryError is returned if there is no entry in the history
diff --git a/annotate/errors_test.go b/annotate/errors_test.go
index 9942f68..a4ec64c 100644
--- a/annotate/errors_test.go
+++ b/annotate/errors_test.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/onXmaps/osm/annotate/internal/core"
+	"github.com/paulmach/osm/annotate/internal/core"
 )
 
 func TestMapErrors(t *testing.T) {
diff --git a/annotate/geo.go b/annotate/geo.go
index 8074a4c..91ba7ab 100644
--- a/annotate/geo.go
+++ b/annotate/geo.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/paulmach/orb"
 	"github.com/paulmach/orb/geo"
-	"github.com/onXmaps/osm"
-	"github.com/onXmaps/osm/internal/mputil"
+	"github.com/paulmach/osm"
+	"github.com/paulmach/osm/internal/mputil"
 )
 
 func wayPointOnSurface(w *osm.Way) orb.Point {
diff --git a/annotate/geo_test.go b/annotate/geo_test.go
index 961c314..bc697d2 100644
--- a/annotate/geo_test.go
+++ b/annotate/geo_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/paulmach/orb"
-	"github.com/onXmaps/osm"
+	"github.com/paulmach/osm"
 )
 
 func TestWayPointOnSurface(t *testing.T) {
diff --git a/annotate/internal/core/compute.go b/annotate/internal/core/compute.go
index 8f830c4..531b815 100644
--- a/annotate/internal/core/compute.go
+++ b/annotate/internal/core/compute.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/onXmaps/osm"
-	"github.com/onXmaps/osm/annotate/shared"
+	"github.com/paulmach/osm"
+	"github.com/paulmach/osm/annotate/shared"
 )
 
 // A Datasourcer is something that acts like a datasource allowing us to
diff --git a/annotate/internal/core/compute_test.go b/annotate/internal/core/compute_test.go
index 3288247..c8fe94e 100644
--- a/annotate/internal/core/compute_test.go
+++ b/annotate/internal/core/compute_test.go
@@ -7,8 +7,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/onXmaps/osm"
-	"github.com/onXmaps/osm/annotate/shared"
+	"github.com/paulmach/osm"
+	"github.com/paulmach/osm/annotate/shared"
 )
 
 var (
diff --git a/annotate/internal/core/datasourcer_test.go b/annotate/internal/core/datasourcer_test.go
index c3ddf50..4a2fb4a 100644
--- a/annotate/internal/core/datasourcer_test.go
+++ b/annotate/internal/core/datasourcer_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"errors"
 
-	"github.com/onXmaps/osm"
+	"github.com/paulmach/osm"
 )
 
 var _ Datasourcer = &TestDS{}
diff --git a/annotate/internal/core/errors.go b/annotate/internal/core/errors.go
index bb6b1cc..451e3ee 100644
--- a/annotate/internal/core/errors.go
+++ b/annotate/internal/core/errors.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/onXmaps/osm"
+	"github.com/paulmach/osm"
 )
 
 // NoHistoryError is returned if there is no entry in the history
diff --git a/annotate/internal/core/types.go b/annotate/internal/core/types.go
index 4910be5..87fb037 100644
--- a/annotate/internal/core/types.go
+++ b/annotate/internal/core/types.go
@@ -3,8 +3,8 @@ package core
 import (
 	"time"
 
-	"github.com/onXmaps/osm"
-	"github.com/onXmaps/osm/annotate/shared"
+	"github.com/paulmach/osm"
+	"github.com/paulmach/osm/annotate/shared"
 )
 
 // A Parent is something that holds children. ie. ways have nodes as children
diff --git a/annotate/internal/core/types_test.go b/annotate/internal/core/types_test.go
index 0578b0e..c5ef266 100644
--- a/annotate/internal/core/types_test.go
+++ b/annotate/internal/core/types_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/onXmaps/osm"
-	"github.com/onXmaps/osm/annotate/shared"
+	"github.com/paulmach/osm"
+	"github.com/paulmach/osm/annotate/shared"
 )
 
 type findVisibleTestCase struct {
diff --git a/annotate/options.go b/annotate/options.go
index 095c5b5..789e19d 100644
--- a/annotate/options.go
+++ b/annotate/options.go
@@ -3,8 +3,8 @@ package annotate
 import (
 	"time"
 
-	"github.com/onXmaps/osm"
-	"github.com/onXmaps/osm/annotate/internal/core"
+	"github.com/paulmach/osm"
+	"github.com/paulmach/osm/annotate/internal/core"
 )
 
 // Option is a parameter that can be used for annotating.
diff --git a/annotate/order.go b/annotate/order.go
index e871e01..022fe12 100644
--- a/annotate/order.go
+++ b/annotate/order.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"sync"
 
-	"github.com/onXmaps/osm"
+	"github.com/paulmach/osm"
 )
 
 // RelationHistoryDatasourcer is an more strict interface for when we only need the relation history.
diff --git a/annotate/order_test.go b/annotate/order_test.go
index 441bbaa..f9f7010 100644
--- a/annotate/order_test.go
+++ b/annotate/order_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/onXmaps/osm"
+	"github.com/paulmach/osm"
 )
 
 func TestChildFirstOrdering(t *testing.T) {
diff --git a/annotate/relation.go b/annotate/relation.go
index ee82deb..e1fe2bb 100644
--- a/annotate/relation.go
+++ b/annotate/relation.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"time"
 
-	"github.com/onXmaps/osm"
-	"github.com/onXmaps/osm/annotate/internal/core"
-	"github.com/onXmaps/osm/annotate/shared"
+	"github.com/paulmach/osm"
+	"github.com/paulmach/osm/annotate/internal/core"
+	"github.com/paulmach/osm/annotate/shared"
 )
 
 // HistoryAsChildrenDatasourcer is an advanced data source that
diff --git a/annotate/relation_test.go b/annotate/relation_test.go
index 754d4a9..1619bbe 100644
--- a/annotate/relation_test.go
+++ b/annotate/relation_test.go
@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/paulmach/orb"
-	"github.com/onXmaps/osm"
+	"github.com/paulmach/osm"
 )
 
 func TestRelation(t *testing.T) {
diff --git a/annotate/shared/child.go b/annotate/shared/child.go
index e526d61..fba9470 100644
--- a/annotate/shared/child.go
+++ b/annotate/shared/child.go
@@ -5,7 +5,7 @@ package shared
 import (
 	"time"
 
-	"github.com/onXmaps/osm"
+	"github.com/paulmach/osm"
 )
 
 // A Child represents a node, way or relation that is a dependent for
diff --git a/annotate/way.go b/annotate/way.go
index d9c129f..7e0bc2e 100644
--- a/annotate/way.go
+++ b/annotate/way.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"time"
 
-	"github.com/onXmaps/osm"
-	"github.com/onXmaps/osm/annotate/internal/core"
-	"github.com/onXmaps/osm/annotate/shared"
+	"github.com/paulmach/osm"
+	"github.com/paulmach/osm/annotate/internal/core"
+	"github.com/paulmach/osm/annotate/shared"
 )
 
 // NodeHistoryDatasourcer is an more strict interface for when we only need node history.
diff --git a/annotate/way_test.go b/annotate/way_test.go
index ac60fce..47cfc3e 100644
--- a/annotate/way_test.go
+++ b/annotate/way_test.go
@@ -8,7 +8,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/onXmaps/osm"
+	"github.com/paulmach/osm"
 )
 
 func TestWays(t *testing.T) {
diff --git a/go.mod b/go.mod
index a3ce86c..040b4cd 100644
--- a/go.mod
+++ b/go.mod
@@ -1,7 +1,11 @@
-module github.com/onXmaps/osm
+module github.com/paulmach/osm
 
 go 1.13
 
+replace (
+	github.com/paulmach/osm => github.com/onXmaps/osm v0.0.0
+)
+
 require (
 	github.com/datadog/czlib v0.0.0-20160811164712-4bc9a24e37f2
 	github.com/paulmach/orb v0.1.3
diff --git a/internal/mputil/mputil.go b/internal/mputil/mputil.go
index 74b7d4a..3e8693d 100644
--- a/internal/mputil/mputil.go
+++ b/internal/mputil/mputil.go
@@ -4,7 +4,7 @@ import (
 	"time"
 
 	"github.com/paulmach/orb"
-	"github.com/onXmaps/osm"
+	"github.com/paulmach/osm"
 )
 
 // Segment is a section of a multipolygon with some extra information
diff --git a/internal/mputil/mputil_test.go b/internal/mputil/mputil_test.go
index 0bde35a..219573f 100644
--- a/internal/mputil/mputil_test.go
+++ b/internal/mputil/mputil_test.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/paulmach/orb"
-	"github.com/onXmaps/osm"
+	"github.com/paulmach/osm"
 )
 
 func TestMultiSegment_LineString(t *testing.T) {
diff --git a/json.go b/json.go
index 05508fe..593f8f9 100644
--- a/json.go
+++ b/json.go
@@ -12,7 +12,7 @@ import (
 //
 //	import (
 //	  jsoniter "github.com/json-iterator/go"
-//	  "github.com/onXmaps/osm"
+//	  "github.com/paulmach/osm"
 //	)
 //
 //	var c = jsoniter.Config{
@@ -36,7 +36,7 @@ var CustomJSONMarshaler interface {
 //
 //	import (
 //	  jsoniter "github.com/json-iterator/go"
-//	  "github.com/onXmaps/osm"
+//	  "github.com/paulmach/osm"
 //	)
 //
 //	var c = jsoniter.Config{
diff --git a/osmapi/changeset.go b/osmapi/changeset.go
index ddb6871..959b4f4 100644
--- a/osmapi/changeset.go
+++ b/osmapi/changeset.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/onXmaps/osm"
+	"github.com/paulmach/osm"
 )
 
 // Changeset returns a given changeset from the osm rest api.
diff --git a/osmapi/datasource.go b/osmapi/datasource.go
index 9cb25d5..223e3b3 100644
--- a/osmapi/datasource.go
+++ b/osmapi/datasource.go
@@ -8,7 +8,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/onXmaps/osm"
+	"github.com/paulmach/osm"
 )
 
 // BaseURL defines the api host. This can be change to hit
diff --git a/osmapi/live_test.go b/osmapi/live_test.go
index 572354d..f09070b 100644
--- a/osmapi/live_test.go
+++ b/osmapi/live_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/onXmaps/osm"
+	"github.com/paulmach/osm"
 
 	"golang.org/x/time/rate"
 )
diff --git a/osmapi/map.go b/osmapi/map.go
index 32f59cb..d0b3a93 100644
--- a/osmapi/map.go
+++ b/osmapi/map.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/onXmaps/osm"
+	"github.com/paulmach/osm"
 )
 
 // Map returns the latest elements in the given bounding box.
diff --git a/osmapi/map_test.go b/osmapi/map_test.go
index 8dbdedf..c829225 100644
--- a/osmapi/map_test.go
+++ b/osmapi/map_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/onXmaps/osm"
+	"github.com/paulmach/osm"
 )
 
 func TestMap_urls(t *testing.T) {
diff --git a/osmapi/node.go b/osmapi/node.go
index 673db5f..13140c3 100644
--- a/osmapi/node.go
+++ b/osmapi/node.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/onXmaps/osm"
+	"github.com/paulmach/osm"
 )
 
 // Node returns the latest version of the node from the osm rest api.
diff --git a/osmapi/node_test.go b/osmapi/node_test.go
index 2bc3d4d..12b541f 100644
--- a/osmapi/node_test.go
+++ b/osmapi/node_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/onXmaps/osm"
+	"github.com/paulmach/osm"
 )
 
 func TestNode_urls(t *testing.T) {
diff --git a/osmapi/note.go b/osmapi/note.go
index e513ca4..c903e56 100644
--- a/osmapi/note.go
+++ b/osmapi/note.go
@@ -6,7 +6,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/onXmaps/osm"
+	"github.com/paulmach/osm"
 )
 
 // Note returns the note from the osm rest api.
diff --git a/osmapi/note_test.go b/osmapi/note_test.go
index 8c15e6c..ec93f43 100644
--- a/osmapi/note_test.go
+++ b/osmapi/note_test.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/onXmaps/osm"
+	"github.com/paulmach/osm"
 )
 
 func TestNote_urls(t *testing.T) {
diff --git a/osmapi/relation.go b/osmapi/relation.go
index b1e2b3f..e629e0b 100644
--- a/osmapi/relation.go
+++ b/osmapi/relation.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/onXmaps/osm"
+	"github.com/paulmach/osm"
 )
 
 // Relation returns the latest version of the relation from the osm rest api.
diff --git a/osmapi/relation_test.go b/osmapi/relation_test.go
index e5a33c8..bea8934 100644
--- a/osmapi/relation_test.go
+++ b/osmapi/relation_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/onXmaps/osm"
+	"github.com/paulmach/osm"
 )
 
 func TestRelation_urls(t *testing.T) {
diff --git a/osmapi/user.go b/osmapi/user.go
index c344f52..17a7bff 100644
--- a/osmapi/user.go
+++ b/osmapi/user.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/onXmaps/osm"
+	"github.com/paulmach/osm"
 )
 
 // User returns the user from the osm rest api.
diff --git a/osmapi/way.go b/osmapi/way.go
index 490b89a..5f834fd 100644
--- a/osmapi/way.go
+++ b/osmapi/way.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/onXmaps/osm"
+	"github.com/paulmach/osm"
 )
 
 // Way returns the latest version of the way from the osm rest api.
diff --git a/osmapi/way_test.go b/osmapi/way_test.go
index bf1fcc8..050357e 100644
--- a/osmapi/way_test.go
+++ b/osmapi/way_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/onXmaps/osm"
+	"github.com/paulmach/osm"
 )
 
 func TestWay_urls(t *testing.T) {
diff --git a/osmgeojson/benchmarks_test.go b/osmgeojson/benchmarks_test.go
index 022074c..1dc71dd 100644
--- a/osmgeojson/benchmarks_test.go
+++ b/osmgeojson/benchmarks_test.go
@@ -5,7 +5,7 @@ import (
 	"io/ioutil"
 	"testing"
 
-	"github.com/onXmaps/osm"
+	"github.com/paulmach/osm"
 )
 
 func BenchmarkConvert(b *testing.B) {
diff --git a/osmgeojson/build_polygon.go b/osmgeojson/build_polygon.go
index a7a12ca..bc00284 100644
--- a/osmgeojson/build_polygon.go
+++ b/osmgeojson/build_polygon.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/paulmach/orb"
 	"github.com/paulmach/orb/geojson"
-	"github.com/onXmaps/osm"
-	"github.com/onXmaps/osm/internal/mputil"
+	"github.com/paulmach/osm"
+	"github.com/paulmach/osm/internal/mputil"
 )
 
 func (ctx *context) buildPolygon(relation *osm.Relation) *geojson.Feature {
diff --git a/osmgeojson/build_polygon_test.go b/osmgeojson/build_polygon_test.go
index ccb4446..d80750c 100644
--- a/osmgeojson/build_polygon_test.go
+++ b/osmgeojson/build_polygon_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/paulmach/orb"
 	"github.com/paulmach/orb/geojson"
-	"github.com/onXmaps/osm"
+	"github.com/paulmach/osm"
 )
 
 func TestConvert_polygon(t *testing.T) {
diff --git a/osmgeojson/convert.go b/osmgeojson/convert.go
index cc93b67..ddc2013 100644
--- a/osmgeojson/convert.go
+++ b/osmgeojson/convert.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/paulmach/orb"
 	"github.com/paulmach/orb/geojson"
-	"github.com/onXmaps/osm"
-	"github.com/onXmaps/osm/internal/mputil"
+	"github.com/paulmach/osm"
+	"github.com/paulmach/osm/internal/mputil"
 )
 
 type context struct {
diff --git a/osmgeojson/convert_test.go b/osmgeojson/convert_test.go
index 99a8307..3209d0e 100644
--- a/osmgeojson/convert_test.go
+++ b/osmgeojson/convert_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/paulmach/orb"
 	"github.com/paulmach/orb/geojson"
-	"github.com/onXmaps/osm"
+	"github.com/paulmach/osm"
 )
 
 func TestConvert(t *testing.T) {
diff --git a/osmgeojson/options_test.go b/osmgeojson/options_test.go
index c0991c5..2d74b96 100644
--- a/osmgeojson/options_test.go
+++ b/osmgeojson/options_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/paulmach/orb/geojson"
-	"github.com/onXmaps/osm"
+	"github.com/paulmach/osm"
 )
 
 var nodeXML = `
diff --git a/osmpbf/decode.go b/osmpbf/decode.go
index cc4aa56..eec3892 100644
--- a/osmpbf/decode.go
+++ b/osmpbf/decode.go
@@ -10,8 +10,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/onXmaps/osm"
-	"github.com/onXmaps/osm/osmpbf/internal/osmpbf"
+	"github.com/paulmach/osm"
+	"github.com/paulmach/osm/osmpbf/internal/osmpbf"
 	"google.golang.org/protobuf/proto"
 )
 
diff --git a/osmpbf/decode_data.go b/osmpbf/decode_data.go
index 58311ac..1847a4b 100644
--- a/osmpbf/decode_data.go
+++ b/osmpbf/decode_data.go
@@ -5,8 +5,8 @@ import (
 	"time"
 
 	"google.golang.org/protobuf/proto"
-	"github.com/onXmaps/osm"
-	"github.com/onXmaps/osm/osmpbf/internal/osmpbf"
+	"github.com/paulmach/osm"
+	"github.com/paulmach/osm/osmpbf/internal/osmpbf"
 	"github.com/paulmach/protoscan"
 )
 
diff --git a/osmpbf/decode_test.go b/osmpbf/decode_test.go
index 75ff134..6b6785c 100644
--- a/osmpbf/decode_test.go
+++ b/osmpbf/decode_test.go
@@ -12,7 +12,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/onXmaps/osm"
+	"github.com/paulmach/osm"
 )
 
 const (
diff --git a/osmpbf/example_stats_test.go b/osmpbf/example_stats_test.go
index bdd4ef8..9a8182f 100644
--- a/osmpbf/example_stats_test.go
+++ b/osmpbf/example_stats_test.go
@@ -7,8 +7,8 @@ import (
 	"os"
 	"time"
 
-	"github.com/onXmaps/osm"
-	"github.com/onXmaps/osm/osmpbf"
+	"github.com/paulmach/osm"
+	"github.com/paulmach/osm/osmpbf"
 )
 
 // ExampleStats demonstrates how to read a full file and gather some stats.
diff --git a/osmpbf/internal/osmpbf/generate.go b/osmpbf/internal/osmpbf/generate.go
index 02e6f77..8eee6f9 100644
--- a/osmpbf/internal/osmpbf/generate.go
+++ b/osmpbf/internal/osmpbf/generate.go
@@ -1,3 +1,3 @@
 package osmpbf
 
-//go:generate protoc  --proto_path=. --go_opt=module=github.com/onXmaps/osmpbf/internal/osmpbf  --go_out=.  fileformat.proto osmformat.proto
+//go:generate protoc  --proto_path=. --go_opt=module=github.com/paulmach/osmpbf/internal/osmpbf  --go_out=.  fileformat.proto osmformat.proto
diff --git a/osmpbf/scanner.go b/osmpbf/scanner.go
index 3b8a870..b047902 100644
--- a/osmpbf/scanner.go
+++ b/osmpbf/scanner.go
@@ -5,7 +5,7 @@ import (
 	"io"
 	"sync/atomic"
 
-	"github.com/onXmaps/osm"
+	"github.com/paulmach/osm"
 )
 
 var _ osm.Scanner = &Scanner{}
diff --git a/osmpbf/scanner_test.go b/osmpbf/scanner_test.go
index 752b183..fd47c08 100644
--- a/osmpbf/scanner_test.go
+++ b/osmpbf/scanner_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/onXmaps/osm"
+	"github.com/paulmach/osm"
 )
 
 var (
diff --git a/osmtest/scanner.go b/osmtest/scanner.go
index 3df0192..1119c86 100644
--- a/osmtest/scanner.go
+++ b/osmtest/scanner.go
@@ -1,6 +1,6 @@
 package osmtest
 
-import "github.com/onXmaps/osm"
+import "github.com/paulmach/osm"
 
 // Scanner implements the osm.Scanner interface with
 // just a list of objects.
diff --git a/osmtest/scanner_test.go b/osmtest/scanner_test.go
index eec981d..f3c6820 100644
--- a/osmtest/scanner_test.go
+++ b/osmtest/scanner_test.go
@@ -5,7 +5,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/onXmaps/osm"
+	"github.com/paulmach/osm"
 )
 
 func TestScanner(t *testing.T) {
diff --git a/osmxml/example_test.go b/osmxml/example_test.go
index 57394bd..61700dc 100644
--- a/osmxml/example_test.go
+++ b/osmxml/example_test.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/onXmaps/osm"
-	"github.com/onXmaps/osm/osmxml"
+	"github.com/paulmach/osm"
+	"github.com/paulmach/osm/osmxml"
 )
 
 func ExampleScanner() {
diff --git a/osmxml/scanner.go b/osmxml/scanner.go
index a634919..b232d35 100644
--- a/osmxml/scanner.go
+++ b/osmxml/scanner.go
@@ -6,7 +6,7 @@ import (
 	"io"
 	"strings"
 
-	"github.com/onXmaps/osm"
+	"github.com/paulmach/osm"
 )
 
 var _ osm.Scanner = &Scanner{}
diff --git a/osmxml/scanner_test.go b/osmxml/scanner_test.go
index 4b417e0..fd85aa7 100644
--- a/osmxml/scanner_test.go
+++ b/osmxml/scanner_test.go
@@ -8,7 +8,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/onXmaps/osm"
+	"github.com/paulmach/osm"
 )
 
 func TestScanner(t *testing.T) {
diff --git a/replication/changesets.go b/replication/changesets.go
index 4480aa5..f149c8c 100644
--- a/replication/changesets.go
+++ b/replication/changesets.go
@@ -10,8 +10,8 @@ import (
 	"net/http"
 	"strconv"
 
-	"github.com/onXmaps/osm"
-	"github.com/onXmaps/osm/osmxml"
+	"github.com/paulmach/osm"
+	"github.com/paulmach/osm/osmxml"
 )
 
 // ChangesetSeqNum indicates the sequence of the changeset replication found here:
diff --git a/replication/interval.go b/replication/interval.go
index 3e05bda..8c258bd 100644
--- a/replication/interval.go
+++ b/replication/interval.go
@@ -11,7 +11,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/onXmaps/osm"
+	"github.com/paulmach/osm"
 )
 
 var _ SeqNum = MinuteSeqNum(0)
diff --git a/testdata/compare_scanners.go b/testdata/compare_scanners.go
index b99cf52..f019dd7 100644
--- a/testdata/compare_scanners.go
+++ b/testdata/compare_scanners.go
@@ -8,9 +8,9 @@ import (
 	"os"
 	"reflect"
 
-	"github.com/onXmaps/osm"
-	"github.com/onXmaps/osm/osmpbf"
-	"github.com/onXmaps/osm/osmxml"
+	"github.com/paulmach/osm"
+	"github.com/paulmach/osm/osmpbf"
+	"github.com/paulmach/osm/osmxml"
 )
 
 func main() {