diff --git a/lib/keepalive_dummy.go b/lib/keepalive_dummy.go
index 205b577..d455a42 100644
--- a/lib/keepalive_dummy.go
+++ b/lib/keepalive_dummy.go
@@ -1,4 +1,5 @@
-//+build !linux
+//go:build !linux
+// +build !linux
 
 package lib
 
diff --git a/lib/keepalive_linux.go b/lib/keepalive_linux.go
index 0dc3285..4811338 100644
--- a/lib/keepalive_linux.go
+++ b/lib/keepalive_linux.go
@@ -1,4 +1,5 @@
-//+build linux
+//go:build linux
+// +build linux
 
 package lib
 
diff --git a/worker/handler_notmuch.go b/worker/handler_notmuch.go
index 5e9c166..8944d28 100644
--- a/worker/handler_notmuch.go
+++ b/worker/handler_notmuch.go
@@ -1,4 +1,5 @@
-//+build notmuch
+//go:build notmuch
+// +build notmuch
 
 package worker
 
diff --git a/worker/notmuch/eventhandlers.go b/worker/notmuch/eventhandlers.go
index 976cbfd..3daabda 100644
--- a/worker/notmuch/eventhandlers.go
+++ b/worker/notmuch/eventhandlers.go
@@ -1,4 +1,5 @@
-//+build notmuch
+//go:build notmuch
+// +build notmuch
 
 package notmuch
 
diff --git a/worker/notmuch/events.go b/worker/notmuch/events.go
index 2140d68..b354227 100644
--- a/worker/notmuch/events.go
+++ b/worker/notmuch/events.go
@@ -1,4 +1,5 @@
-//+build notmuch
+//go:build notmuch
+// +build notmuch
 
 package notmuch
 
diff --git a/worker/notmuch/lib/database.go b/worker/notmuch/lib/database.go
index ad670c5..46a39bc 100644
--- a/worker/notmuch/lib/database.go
+++ b/worker/notmuch/lib/database.go
@@ -1,4 +1,5 @@
-//+build notmuch
+//go:build notmuch
+// +build notmuch
 
 package lib
 
diff --git a/worker/notmuch/lib/thread.go b/worker/notmuch/lib/thread.go
index 297260d..33bf872 100644
--- a/worker/notmuch/lib/thread.go
+++ b/worker/notmuch/lib/thread.go
@@ -1,4 +1,5 @@
-//+build notmuch
+//go:build notmuch
+// +build notmuch
 
 package lib
 
diff --git a/worker/notmuch/message.go b/worker/notmuch/message.go
index 41bfd0b..c95c9ba 100644
--- a/worker/notmuch/message.go
+++ b/worker/notmuch/message.go
@@ -1,4 +1,5 @@
-//+build notmuch
+//go:build notmuch
+// +build notmuch
 
 package notmuch
 
diff --git a/worker/notmuch/worker.go b/worker/notmuch/worker.go
index 09b5d50..575cd56 100644
--- a/worker/notmuch/worker.go
+++ b/worker/notmuch/worker.go
@@ -1,4 +1,5 @@
-//+build notmuch
+//go:build notmuch
+// +build notmuch
 
 package notmuch