diff --git a/.gitignore b/.gitignore
index 6ada8f46..4bc50b88 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@ warchaeology
 # Dependency directories (remove the comment below to include it)
 # vendor/
 /.idea/
+/.vscode/
 
 /dist/
 /docs/.hugo_build.lock
diff --git a/arcreader/arcreader.go b/arcreader/arcreader.go
index 0a694663..9e1b8071 100644
--- a/arcreader/arcreader.go
+++ b/arcreader/arcreader.go
@@ -3,7 +3,7 @@ package arcreader
 import (
 	"bufio"
 
-	"github.com/nlnwa/gowarc"
+	"github.com/nlnwa/gowarc/v2"
 	"github.com/spf13/afero"
 )
 
diff --git a/arcreader/arcreader_test.go b/arcreader/arcreader_test.go
index c41e2bcf..7c71b769 100644
--- a/arcreader/arcreader_test.go
+++ b/arcreader/arcreader_test.go
@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/nlnwa/gowarc"
+	"github.com/nlnwa/gowarc/v2"
 	"github.com/nlnwa/warchaeology/v3/internal/warc"
 	"github.com/spf13/afero"
 )
diff --git a/arcreader/unmarshaler.go b/arcreader/unmarshaler.go
index e33ed56e..3b88d117 100644
--- a/arcreader/unmarshaler.go
+++ b/arcreader/unmarshaler.go
@@ -12,7 +12,7 @@ import (
 	"time"
 
 	"github.com/klauspost/compress/gzip"
-	"github.com/nlnwa/gowarc"
+	"github.com/nlnwa/gowarc/v2"
 	mytime "github.com/nlnwa/warchaeology/v3/internal/time"
 )
 
diff --git a/cmd/aart/aart.go b/cmd/aart/aart.go
index 428d9389..4458f097 100644
--- a/cmd/aart/aart.go
+++ b/cmd/aart/aart.go
@@ -14,7 +14,7 @@ import (
 	"os"
 
 	"github.com/nfnt/resize"
-	"github.com/nlnwa/gowarc"
+	"github.com/nlnwa/gowarc/v2"
 	"github.com/nlnwa/warchaeology/v3/cmd/internal/flag"
 	"github.com/nlnwa/warchaeology/v3/internal/filter"
 	"github.com/nlnwa/warchaeology/v3/internal/warc"
diff --git a/cmd/cat/cat.go b/cmd/cat/cat.go
index 23b12067..606f7403 100644
--- a/cmd/cat/cat.go
+++ b/cmd/cat/cat.go
@@ -11,7 +11,7 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/nlnwa/gowarc"
+	"github.com/nlnwa/gowarc/v2"
 	"github.com/nlnwa/warchaeology/v3/cmd/internal/flag"
 	"github.com/nlnwa/warchaeology/v3/cmd/internal/log"
 	"github.com/nlnwa/warchaeology/v3/internal/filewalker"
diff --git a/cmd/cat/cat_test.go b/cmd/cat/cat_test.go
index 6d204537..5281d391 100644
--- a/cmd/cat/cat_test.go
+++ b/cmd/cat/cat_test.go
@@ -11,7 +11,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/nlnwa/gowarc"
+	"github.com/nlnwa/gowarc/v2"
 	"github.com/nlnwa/warchaeology/v3/internal/warc"
 )
 
diff --git a/cmd/console/RecordWidget.go b/cmd/console/RecordWidget.go
index 5ce46a2e..a3b5fa73 100644
--- a/cmd/console/RecordWidget.go
+++ b/cmd/console/RecordWidget.go
@@ -6,7 +6,7 @@ import (
 	"io"
 
 	"github.com/awesome-gocui/gocui"
-	"github.com/nlnwa/gowarc"
+	"github.com/nlnwa/gowarc/v2"
 	"github.com/nlnwa/warchaeology/v3/cmd/internal/flag"
 	"github.com/spf13/viper"
 )
diff --git a/cmd/console/console.go b/cmd/console/console.go
index 33f7ef2f..c95236a0 100644
--- a/cmd/console/console.go
+++ b/cmd/console/console.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/awesome-gocui/gocui"
-	"github.com/nlnwa/gowarc"
+	"github.com/nlnwa/gowarc/v2"
 	"github.com/nlnwa/warchaeology/v3/cmd/internal/flag"
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/console/filter.go b/cmd/console/filter.go
index ea8e6f73..25c5eac3 100644
--- a/cmd/console/filter.go
+++ b/cmd/console/filter.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 
 	"github.com/awesome-gocui/gocui"
-	"github.com/nlnwa/gowarc"
+	"github.com/nlnwa/gowarc/v2"
 )
 
 type recordFilter struct {
diff --git a/cmd/console/records.go b/cmd/console/records.go
index 179eb24f..27384f00 100644
--- a/cmd/console/records.go
+++ b/cmd/console/records.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 
 	"github.com/awesome-gocui/gocui"
-	"github.com/nlnwa/gowarc"
+	"github.com/nlnwa/gowarc/v2"
 	"github.com/nlnwa/warchaeology/v3/cmd/internal/flag"
 	"github.com/spf13/viper"
 )
diff --git a/cmd/convert/arc/arc.go b/cmd/convert/arc/arc.go
index af14179f..eb033dd6 100644
--- a/cmd/convert/arc/arc.go
+++ b/cmd/convert/arc/arc.go
@@ -9,7 +9,7 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/nlnwa/gowarc"
+	"github.com/nlnwa/gowarc/v2"
 	"github.com/nlnwa/warchaeology/v3/arcreader"
 	"github.com/nlnwa/warchaeology/v3/cmd/internal/flag"
 	"github.com/nlnwa/warchaeology/v3/cmd/internal/log"
diff --git a/cmd/convert/nedlib/nedlib.go b/cmd/convert/nedlib/nedlib.go
index a86292a1..6fc7a725 100644
--- a/cmd/convert/nedlib/nedlib.go
+++ b/cmd/convert/nedlib/nedlib.go
@@ -9,7 +9,7 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/nlnwa/gowarc"
+	"github.com/nlnwa/gowarc/v2"
 	"github.com/nlnwa/warchaeology/v3/cmd/internal/flag"
 	"github.com/nlnwa/warchaeology/v3/cmd/internal/log"
 	"github.com/nlnwa/warchaeology/v3/internal/filewalker"
diff --git a/cmd/convert/warc/warc.go b/cmd/convert/warc/warc.go
index 94feefbc..f585bbd2 100644
--- a/cmd/convert/warc/warc.go
+++ b/cmd/convert/warc/warc.go
@@ -9,7 +9,7 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/nlnwa/gowarc"
+	"github.com/nlnwa/gowarc/v2"
 	"github.com/nlnwa/warchaeology/v3/cmd/internal/flag"
 	"github.com/nlnwa/warchaeology/v3/cmd/internal/log"
 	"github.com/nlnwa/warchaeology/v3/internal/filewalker"
diff --git a/cmd/dedup/dedup.go b/cmd/dedup/dedup.go
index 1f6e5e4f..a2eb9e12 100644
--- a/cmd/dedup/dedup.go
+++ b/cmd/dedup/dedup.go
@@ -9,7 +9,7 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/nlnwa/gowarc"
+	"github.com/nlnwa/gowarc/v2"
 	"github.com/nlnwa/warchaeology/v3/cmd/internal/flag"
 	"github.com/nlnwa/warchaeology/v3/cmd/internal/log"
 	"github.com/nlnwa/warchaeology/v3/internal/filewalker"
diff --git a/cmd/internal/flag/filter_flags.go b/cmd/internal/flag/filter_flags.go
index 9af48e3a..2c1c818d 100644
--- a/cmd/internal/flag/filter_flags.go
+++ b/cmd/internal/flag/filter_flags.go
@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/nlnwa/gowarc"
+	"github.com/nlnwa/gowarc/v2"
 	"github.com/nlnwa/warchaeology/v3/internal/filter"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
diff --git a/cmd/internal/flag/warcrecordoptions_flags.go b/cmd/internal/flag/warcrecordoptions_flags.go
index bb4cb994..7ebc12de 100644
--- a/cmd/internal/flag/warcrecordoptions_flags.go
+++ b/cmd/internal/flag/warcrecordoptions_flags.go
@@ -3,7 +3,7 @@ package flag
 import (
 	"os"
 
-	"github.com/nlnwa/gowarc"
+	"github.com/nlnwa/gowarc/v2"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
diff --git a/cmd/ls/ls.go b/cmd/ls/ls.go
index d7f81f6f..4d41f5cd 100644
--- a/cmd/ls/ls.go
+++ b/cmd/ls/ls.go
@@ -9,7 +9,7 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/nlnwa/gowarc"
+	"github.com/nlnwa/gowarc/v2"
 	"github.com/nlnwa/warchaeology/v3/cmd/internal/flag"
 	"github.com/nlnwa/warchaeology/v3/cmd/internal/log"
 	"github.com/nlnwa/warchaeology/v3/internal/filewalker"
diff --git a/cmd/ls/ls_test.go b/cmd/ls/ls_test.go
index 2a4f4566..9265a0e2 100644
--- a/cmd/ls/ls_test.go
+++ b/cmd/ls/ls_test.go
@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/nlnwa/gowarc"
+	"github.com/nlnwa/gowarc/v2"
 	"github.com/spf13/afero"
 )
 
diff --git a/cmd/ls/recordwriter.go b/cmd/ls/recordwriter.go
index 70c1c6ca..9ddfc589 100644
--- a/cmd/ls/recordwriter.go
+++ b/cmd/ls/recordwriter.go
@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/nlnwa/gowarc"
+	"github.com/nlnwa/gowarc/v2"
 	"github.com/nlnwa/warchaeology/v3/internal/time"
 	"github.com/nlnwa/warchaeology/v3/internal/util"
 	"github.com/nlnwa/warchaeology/v3/internal/warc"
diff --git a/cmd/validate/validate.go b/cmd/validate/validate.go
index 93a1592e..ec3dced4 100644
--- a/cmd/validate/validate.go
+++ b/cmd/validate/validate.go
@@ -18,7 +18,7 @@ import (
 	"sync"
 	"syscall"
 
-	"github.com/nlnwa/gowarc"
+	"github.com/nlnwa/gowarc/v2"
 	"github.com/nlnwa/warchaeology/v3/cmd/internal/flag"
 	"github.com/nlnwa/warchaeology/v3/cmd/internal/log"
 	"github.com/nlnwa/warchaeology/v3/internal/filewalker"
diff --git a/go.mod b/go.mod
index 0d216cf4..98055bfa 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,8 @@
 module github.com/nlnwa/warchaeology/v3
 
-go 1.22
+go 1.22.0
+
+toolchain go1.22.7
 
 require (
 	github.com/awesome-gocui/gocui v1.1.0
@@ -10,7 +12,7 @@ require (
 	github.com/kirsle/configdir v0.0.0-20170128060238-e45d2f54772f
 	github.com/klauspost/compress v1.17.11
 	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646
-	github.com/nlnwa/gowarc v1.6.0
+	github.com/nlnwa/gowarc/v2 v2.0.1
 	github.com/nlnwa/whatwg-url v0.5.0
 	github.com/shirou/gopsutil v3.21.11+incompatible
 	github.com/spf13/afero v1.11.0
@@ -24,7 +26,7 @@ require (
 )
 
 require (
-	github.com/bits-and-blooms/bitset v1.14.2 // indirect
+	github.com/bits-and-blooms/bitset v1.14.3 // indirect
 	github.com/cespare/xxhash v1.1.0 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
@@ -53,7 +55,7 @@ require (
 	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/prometheus/prometheus v0.54.1 // indirect
+	github.com/prometheus/prometheus v0.55.0 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/sagikazarmark/locafero v0.6.0 // indirect
@@ -64,10 +66,10 @@ require (
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
 	go.opencensus.io v0.24.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/net v0.28.0 // indirect
-	golang.org/x/sys v0.24.0 // indirect
-	golang.org/x/term v0.23.0 // indirect
-	golang.org/x/text v0.17.0 // indirect
+	golang.org/x/net v0.30.0 // indirect
+	golang.org/x/sys v0.26.0 // indirect
+	golang.org/x/term v0.25.0 // indirect
+	golang.org/x/text v0.19.0 // indirect
 	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 )
diff --git a/go.sum b/go.sum
index 37965cec..e105edc0 100644
--- a/go.sum
+++ b/go.sum
@@ -6,8 +6,8 @@ github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5
 github.com/awesome-gocui/gocui v1.1.0 h1:db2j7yFEoHZjpQFeE2xqiatS8bm1lO3THeLwE6MzOII=
 github.com/awesome-gocui/gocui v1.1.0/go.mod h1:M2BXkrp7PR97CKnPRT7Rk0+rtswChPtksw/vRAESGpg=
 github.com/bits-and-blooms/bitset v1.13.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
-github.com/bits-and-blooms/bitset v1.14.2 h1:YXVoyPndbdvcEVcseEovVfp0qjJp7S+i5+xgp/Nfbdc=
-github.com/bits-and-blooms/bitset v1.14.2/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
+github.com/bits-and-blooms/bitset v1.14.3 h1:Gd2c8lSNf9pKXom5JtD7AaKO8o7fGQ2LtFj1436qilA=
+github.com/bits-and-blooms/bitset v1.14.3/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
@@ -143,8 +143,8 @@ github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyua
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
-github.com/nlnwa/gowarc v1.6.0 h1:FsydfRCpdfcyXb4sHoB0Q17AL9po59rPdcqrimFNgCU=
-github.com/nlnwa/gowarc v1.6.0/go.mod h1:BmfIlIm4XY+88ZsCfr9NRU8PX+9In/o/m3qjNDpEcHM=
+github.com/nlnwa/gowarc/v2 v2.0.1 h1:B8JDB9z8eSDTVtFmGsBf5yQq8ZWeR8ykw1WP3ztTdxk=
+github.com/nlnwa/gowarc/v2 v2.0.1/go.mod h1:2c3u/waySsUNdIvKQPrxq4gmB1uAaMOIJrEUcmMutAY=
 github.com/nlnwa/whatwg-url v0.5.0 h1:l71cqfqG44+VCQZQX3wD4bwheFWicPxuwaCimLEfpDo=
 github.com/nlnwa/whatwg-url v0.5.0/go.mod h1:X/ejnFFVbaOWdSul+cnlsSHviCzGZJdvPkgc9zD8IY8=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
@@ -158,10 +158,10 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
 github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
-github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc=
-github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8=
-github.com/prometheus/prometheus v0.54.1 h1:vKuwQNjnYN2/mDoWfHXDhAsz/68q/dQDb+YbcEqU7MQ=
-github.com/prometheus/prometheus v0.54.1/go.mod h1:xlLByHhk2g3ycakQGrMaU8K7OySZx98BzeCR99991NY=
+github.com/prometheus/common v0.59.1 h1:LXb1quJHWm1P6wq/U824uxYi4Sg0oGvNeUm1z5dJoX0=
+github.com/prometheus/common v0.59.1/go.mod h1:GpWM7dewqmVYcd7SmRaiWVe9SSqjf0UrwnYnpEZNuT0=
+github.com/prometheus/prometheus v0.55.0 h1:ITinOi1zr3HemoVWHf679PfRRmpxZOcR4nEvsze6eB0=
+github.com/prometheus/prometheus v0.55.0/go.mod h1:GGS7QlWKCqCbcEzWsVahYIfQwiGhcExkarHyLJTsv6I=
 github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.3/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
@@ -260,8 +260,8 @@ golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
 golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
-golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
-golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
+golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
+golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -288,8 +288,8 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
-golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
+golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -297,8 +297,8 @@ golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
 golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
 golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
-golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU=
-golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk=
+golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24=
+golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
@@ -306,8 +306,8 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
-golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
+golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
diff --git a/internal/filter/filter.go b/internal/filter/filter.go
index 4ecb77bf..e54fc125 100644
--- a/internal/filter/filter.go
+++ b/internal/filter/filter.go
@@ -21,7 +21,7 @@ import (
 	"slices"
 	"strings"
 
-	"github.com/nlnwa/gowarc"
+	"github.com/nlnwa/gowarc/v2"
 )
 
 type RecordFilter struct {
diff --git a/internal/index/codec.go b/internal/index/codec.go
index f82a7d61..c4e5d47c 100644
--- a/internal/index/codec.go
+++ b/internal/index/codec.go
@@ -4,7 +4,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/nlnwa/gowarc"
+	"github.com/nlnwa/gowarc/v2"
 )
 
 const (
diff --git a/internal/index/codec_test.go b/internal/index/codec_test.go
index efbada9b..e74a8722 100644
--- a/internal/index/codec_test.go
+++ b/internal/index/codec_test.go
@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/nlnwa/gowarc"
+	"github.com/nlnwa/gowarc/v2"
 )
 
 func Test_codec_decode(t *testing.T) {
diff --git a/internal/index/digestindex.go b/internal/index/digestindex.go
index 9dc4d80a..b9a2d43e 100644
--- a/internal/index/digestindex.go
+++ b/internal/index/digestindex.go
@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 
 	"github.com/dgraph-io/badger/v3"
-	"github.com/nlnwa/gowarc"
+	"github.com/nlnwa/gowarc/v2"
 	"github.com/nlnwa/warchaeology/v3/internal/util"
 )
 
diff --git a/internal/warc/iterator.go b/internal/warc/iterator.go
index 385499ae..925a9302 100644
--- a/internal/warc/iterator.go
+++ b/internal/warc/iterator.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/nlnwa/gowarc"
+	"github.com/nlnwa/gowarc/v2"
 	"github.com/nlnwa/warchaeology/v3/internal/filter"
 )
 
diff --git a/internal/warc/iterator_test.go b/internal/warc/iterator_test.go
index a1964678..47e81428 100644
--- a/internal/warc/iterator_test.go
+++ b/internal/warc/iterator_test.go
@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/nlnwa/gowarc"
+	"github.com/nlnwa/gowarc/v2"
 )
 
 var (
diff --git a/internal/warc/record.go b/internal/warc/record.go
index 49fe4a7c..af55d90e 100644
--- a/internal/warc/record.go
+++ b/internal/warc/record.go
@@ -4,7 +4,7 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/nlnwa/gowarc"
+	"github.com/nlnwa/gowarc/v2"
 )
 
 type Metadata struct {
diff --git a/internal/warcwriterconfig/config.go b/internal/warcwriterconfig/config.go
index 0d7102b7..2e2f1945 100644
--- a/internal/warcwriterconfig/config.go
+++ b/internal/warcwriterconfig/config.go
@@ -7,7 +7,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/nlnwa/gowarc"
+	"github.com/nlnwa/gowarc/v2"
 	"github.com/nlnwa/warchaeology/v3/internal/hooks"
 	"github.com/nlnwa/warchaeology/v3/internal/util"
 )
diff --git a/internal/warcwriterconfig/namer.go b/internal/warcwriterconfig/namer.go
index 2ba52d1c..98649253 100644
--- a/internal/warcwriterconfig/namer.go
+++ b/internal/warcwriterconfig/namer.go
@@ -6,7 +6,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/nlnwa/gowarc"
+	"github.com/nlnwa/gowarc/v2"
 )
 
 func NewIdentityNamer(fromFileName, filePrefix, dir string) gowarc.WarcFileNameGenerator {
diff --git a/nedlibreader/nedlibreader.go b/nedlibreader/nedlibreader.go
index 7016a1a8..dc79bcdf 100644
--- a/nedlibreader/nedlibreader.go
+++ b/nedlibreader/nedlibreader.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/nlnwa/gowarc"
+	"github.com/nlnwa/gowarc/v2"
 	"github.com/spf13/afero"
 )
 
diff --git a/nedlibreader/nedlibreader_test.go b/nedlibreader/nedlibreader_test.go
index 5bce895e..66ea0432 100644
--- a/nedlibreader/nedlibreader_test.go
+++ b/nedlibreader/nedlibreader_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/nlnwa/gowarc"
+	"github.com/nlnwa/gowarc/v2"
 	"github.com/spf13/afero"
 )