diff --git a/README.md b/README.md
index 719ffeb..57defb4 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 # better-tostring
 
 [![License](http://img.shields.io/:license-Apache%202-green.svg)](http://www.apache.org/licenses/LICENSE-2.0.txt)
-[![Latest version](https://index.scala-lang.org/kubukoz/better-tostring/better-tostring/latest.svg)](https://index.scala-lang.org/kubukoz/better-tostring/better-tostring)
-[![Maven Central](https://img.shields.io/maven-central/v/com.kubukoz/better-tostring_2.13.5.svg)](http://search.maven.org/#search%7Cga%7C1%7Cbetter-tostring)
+[![Latest version](https://index.scala-lang.org/polyvariant/better-tostring/better-tostring/latest.svg)](https://index.scala-lang.org/kubukoz/better-tostring/better-tostring)
+[![Maven Central](https://img.shields.io/maven-central/v/org.polyvariant/better-tostring_2.13.5.svg)](http://search.maven.org/#search%7Cga%7C1%7Cbetter-tostring)
 
 A Scala compiler plugin that replaces the default `toString` implementation of case classes with a more verbose one.
 
@@ -27,16 +27,18 @@ User("Joe", 18).toString() // "User(name = Joe, age = 18)"
 In sbt:
 
 ```scala
-libraryDependencies += compilerPlugin("com.kubukoz" % "better-tostring" % version cross CrossVersion.full)
+libraryDependencies += compilerPlugin("org.polyvariant" % "better-tostring" % version cross CrossVersion.full)
 ```
 
+(note: versions before `0.3.8` were published under the `com.kubukoz` organization instead of `org.polyvariant`)
+
 The plugin is currently published for the following Scala versions:
 
 - 2.12.13, 2.12.14, 2.12.15
 - 2.13.4, 2.13.5, 2.13.6
 - 3.0.0, 3.0.1, 3.0.2, 3.1.0-RC2
 
-For older Scala versions, see [previous versions of better-tostring](https://repo1.maven.org/maven2/com/kubukoz).
+For older Scala versions, see [previous versions of better-tostring](https://repo1.maven.org/maven2/org/polyvariant) ([or even older versions](https://repo1.maven.org/maven2/org/polyvariant)).
 
 As a rule of thumb, active support will include _at least_ 3 latest stable versions of 2.12, 2.13 and 3.0 for the foreseeable future.
 
diff --git a/plugin/src/main/resources/plugin.properties b/plugin/src/main/resources/plugin.properties
index cc0ddac..2a63741 100644
--- a/plugin/src/main/resources/plugin.properties
+++ b/plugin/src/main/resources/plugin.properties
@@ -1 +1 @@
-pluginClass=com.kubukoz.BetterToStringPlugin
+pluginClass=org.polyvariant.BetterToStringPlugin
diff --git a/plugin/src/main/resources/scalac-plugin.xml b/plugin/src/main/resources/scalac-plugin.xml
index 67eb16e..050706a 100644
--- a/plugin/src/main/resources/scalac-plugin.xml
+++ b/plugin/src/main/resources/scalac-plugin.xml
@@ -1,4 +1,4 @@
 <plugin>
     <name>better-tostring</name>
-    <classname>com.kubukoz.BetterToStringPlugin</classname>
+    <classname>org.polyvariant.BetterToStringPlugin</classname>
 </plugin>
diff --git a/plugin/src/main/scala-2/BetterToStringPlugin.scala b/plugin/src/main/scala-2/BetterToStringPlugin.scala
index 699bd83..88b4e27 100644
--- a/plugin/src/main/scala-2/BetterToStringPlugin.scala
+++ b/plugin/src/main/scala-2/BetterToStringPlugin.scala
@@ -1,4 +1,4 @@
-package com.kubukoz
+package org.polyvariant
 
 import scala.tools.nsc.Global
 import scala.tools.nsc.Phase
diff --git a/plugin/src/main/scala-2/Scala2CompilerApi.scala b/plugin/src/main/scala-2/Scala2CompilerApi.scala
index 93d92a8..21e0f0f 100644
--- a/plugin/src/main/scala-2/Scala2CompilerApi.scala
+++ b/plugin/src/main/scala-2/Scala2CompilerApi.scala
@@ -1,4 +1,4 @@
-package com.kubukoz
+package org.polyvariant
 
 import scala.reflect.internal.Flags
 import scala.tools.nsc.Global
diff --git a/plugin/src/main/scala-3/BetterToStringPlugin.scala b/plugin/src/main/scala-3/BetterToStringPlugin.scala
index 31cdfb0..64c7dad 100644
--- a/plugin/src/main/scala-3/BetterToStringPlugin.scala
+++ b/plugin/src/main/scala-3/BetterToStringPlugin.scala
@@ -1,4 +1,4 @@
-package com.kubukoz
+package org.polyvariant
 
 import dotty.tools.dotc.ast.tpd
 import dotty.tools.dotc.core.Contexts.Context
diff --git a/plugin/src/main/scala-3/Scala3CompilerApi.scala b/plugin/src/main/scala-3/Scala3CompilerApi.scala
index 3aefc97..aa5c642 100644
--- a/plugin/src/main/scala-3/Scala3CompilerApi.scala
+++ b/plugin/src/main/scala-3/Scala3CompilerApi.scala
@@ -1,4 +1,4 @@
-package com.kubukoz
+package org.polyvariant
 
 import dotty.tools.dotc.ast.Trees
 import dotty.tools.dotc.ast.tpd
diff --git a/plugin/src/main/scala/BetterToStringImpl.scala b/plugin/src/main/scala/BetterToStringImpl.scala
index fc23e5c..31b2075 100644
--- a/plugin/src/main/scala/BetterToStringImpl.scala
+++ b/plugin/src/main/scala/BetterToStringImpl.scala
@@ -1,4 +1,4 @@
-package com.kubukoz
+package org.polyvariant
 
 // Source-compatible core between 2.x and 3.x implementations