diff --git a/README.md b/README.md
index c9e5730..342205e 100644
--- a/README.md
+++ b/README.md
@@ -113,7 +113,7 @@ sbt-osgi can be configured with the following settings:
 Example `build.sbt`:
 
 ```
-organization := "com.typesafe.sbt"
+organization := "com.github.sbt"
 
 name := "osgi.demo"
 
diff --git a/src/sbt-test/sbt-osgi/test-00-defaults/build.sbt b/src/sbt-test/sbt-osgi/test-00-defaults/build.sbt
index 579aeff..7554553 100644
--- a/src/sbt-test/sbt-osgi/test-00-defaults/build.sbt
+++ b/src/sbt-test/sbt-osgi/test-00-defaults/build.sbt
@@ -1,6 +1,6 @@
 lazy val test00 = (project in file("")).enablePlugins(SbtOsgi)
 
-organization := "com.typesafe.sbt"
+organization := "com.github.sbt"
 
 name := "sbt-osgi-test"
 
diff --git a/src/sbt-test/sbt-osgi/test-01-contents/build.sbt b/src/sbt-test/sbt-osgi/test-01-contents/build.sbt
index 3b623ab..b391777 100644
--- a/src/sbt-test/sbt-osgi/test-01-contents/build.sbt
+++ b/src/sbt-test/sbt-osgi/test-01-contents/build.sbt
@@ -1,6 +1,6 @@
 lazy val test01 = (project in file(".")).enablePlugins(SbtOsgi)
 
-organization := "com.typesafe.sbt"
+organization := "com.github.sbt"
 
 name := "sbt-osgi-test"
 
@@ -47,8 +47,8 @@ TaskKey[Unit]("verifyBundle") := {
       sys.error("Expected 'Bundle-Name: sbt-osgi-test' in manifest!" + butWas)
     if (!(lines contains "Bundle-RequiredExecutionEnvironment: JavaSE-1.7,JavaSE-1.8"))
       sys.error("Expected 'Bundle-RequiredExecutionEnvironment: JavaSE-1.7,JavaSE-1.8' in manifest!" + butWas)
-    if (!(lines contains "Bundle-Vendor: com.typesafe.sbt"))
-      sys.error("Expected 'Bundle-Vendor: com.typesafe.sbt' in manifest!" + butWas)
+    if (!(lines contains "Bundle-Vendor: com.github.sbt"))
+      sys.error("Expected 'Bundle-Vendor: com.github.sbt' in manifest!" + butWas)
     if (!(lines contains "Bundle-SymbolicName: com.typesafe.sbt.osgi.test"))
       sys.error("Expected 'Bundle-SymbolicName: com.typesafe.sbt.osgi.test' in manifest!" + butWas)
     if (!(lines contains "Bundle-Version: 1.2.3"))
diff --git a/src/sbt-test/sbt-osgi/test-02-includeresource/build.sbt b/src/sbt-test/sbt-osgi/test-02-includeresource/build.sbt
index 2d9d6c5..8904fc6 100644
--- a/src/sbt-test/sbt-osgi/test-02-includeresource/build.sbt
+++ b/src/sbt-test/sbt-osgi/test-02-includeresource/build.sbt
@@ -1,6 +1,6 @@
 lazy val test02 = (project in file("")).enablePlugins(SbtOsgi)
 
-organization := "com.typesafe.sbt"
+organization := "com.github.sbt"
 
 name := "sbt-osgi-test"
 
diff --git a/src/sbt-test/sbt-osgi/test-03-arbitraryHeaders/build.sbt b/src/sbt-test/sbt-osgi/test-03-arbitraryHeaders/build.sbt
index be46715..8dbaab5 100644
--- a/src/sbt-test/sbt-osgi/test-03-arbitraryHeaders/build.sbt
+++ b/src/sbt-test/sbt-osgi/test-03-arbitraryHeaders/build.sbt
@@ -1,6 +1,6 @@
 lazy val test03 = (project in file("")).enablePlugins(SbtOsgi)
 
-organization := "com.typesafe.sbt"
+organization := "com.github.sbt"
 
 name := "sbt-osgi-test"
 
diff --git a/src/sbt-test/sbt-osgi/test-04-embeddedJars/build.sbt b/src/sbt-test/sbt-osgi/test-04-embeddedJars/build.sbt
index 5dc82b5..0cf2f4f 100644
--- a/src/sbt-test/sbt-osgi/test-04-embeddedJars/build.sbt
+++ b/src/sbt-test/sbt-osgi/test-04-embeddedJars/build.sbt
@@ -1,6 +1,6 @@
 lazy val test04 = (project in file("")).enablePlugins(SbtOsgi)
 
-organization := "com.typesafe.sbt"
+organization := "com.github.sbt"
 
 name := "sbt-osgi-test"
 
diff --git a/src/sbt-test/sbt-osgi/test-06-explodedJars/build.sbt b/src/sbt-test/sbt-osgi/test-06-explodedJars/build.sbt
index abeb576..853c188 100644
--- a/src/sbt-test/sbt-osgi/test-06-explodedJars/build.sbt
+++ b/src/sbt-test/sbt-osgi/test-06-explodedJars/build.sbt
@@ -1,6 +1,6 @@
 lazy val test06 = (project in file("")).enablePlugins(SbtOsgi)
 
-organization := "com.typesafe.sbt"
+organization := "com.github.sbt"
 
 name := "sbt-osgi-test"
 
diff --git a/src/sbt-test/sbt-osgi/test-07-failOnClassesExcludedFromJar/build.sbt b/src/sbt-test/sbt-osgi/test-07-failOnClassesExcludedFromJar/build.sbt
index 1a535e9..db4599b 100644
--- a/src/sbt-test/sbt-osgi/test-07-failOnClassesExcludedFromJar/build.sbt
+++ b/src/sbt-test/sbt-osgi/test-07-failOnClassesExcludedFromJar/build.sbt
@@ -1,6 +1,6 @@
 lazy val test01 = (project in file(".")).enablePlugins(SbtOsgi)
 
-organization := "com.typesafe.sbt"
+organization := "com.github.sbt"
 
 name := "sbt-osgi-test"
 
@@ -55,8 +55,8 @@ TaskKey[Unit]("verifyBundle") := {
       sys.error("Expected 'Bundle-Name: sbt-osgi-test' in manifest!" + butWas)
     if (!(lines contains "Bundle-RequiredExecutionEnvironment: JavaSE-1.7,JavaSE-1.8"))
       sys.error("Expected 'Bundle-RequiredExecutionEnvironment: JavaSE-1.7,JavaSE-1.8' in manifest!" + butWas)
-    if (!(lines contains "Bundle-Vendor: com.typesafe.sbt"))
-      sys.error("Expected 'Bundle-Vendor: com.typesafe.sbt' in manifest!" + butWas)
+    if (!(lines contains "Bundle-Vendor: com.github.sbt"))
+      sys.error("Expected 'Bundle-Vendor: com.github.sbt' in manifest!" + butWas)
     if (!(lines contains "Bundle-SymbolicName: com.typesafe.sbt.osgi.test"))
       sys.error("Expected 'Bundle-SymbolicName: com.typesafe.sbt.osgi.test' in manifest!" + butWas)
     if (!(lines contains "Bundle-Version: 1.2.3"))
diff --git a/src/sbt-test/sbt-osgi/test-08-packageWithJVMJar/build.sbt b/src/sbt-test/sbt-osgi/test-08-packageWithJVMJar/build.sbt
index cd48cd2..c2964b1 100644
--- a/src/sbt-test/sbt-osgi/test-08-packageWithJVMJar/build.sbt
+++ b/src/sbt-test/sbt-osgi/test-08-packageWithJVMJar/build.sbt
@@ -1,6 +1,6 @@
 lazy val test08 = (project in file("")).enablePlugins(SbtOsgi)
 
-organization := "com.typesafe.sbt"
+organization := "com.github.sbt"
 
 name := "sbt-osgi-test"
 
diff --git a/src/sbt-test/sbt-osgi/test-09-automatic-module-name-in-opts/build.sbt b/src/sbt-test/sbt-osgi/test-09-automatic-module-name-in-opts/build.sbt
index ebf29b8..c9590bf 100644
--- a/src/sbt-test/sbt-osgi/test-09-automatic-module-name-in-opts/build.sbt
+++ b/src/sbt-test/sbt-osgi/test-09-automatic-module-name-in-opts/build.sbt
@@ -1,6 +1,6 @@
 lazy val test01 = (project in file(".")).enablePlugins(SbtOsgi)
 
-organization := "com.typesafe.sbt"
+organization := "com.github.sbt"
 
 name := "sbt-osgi-test"
 
@@ -56,8 +56,8 @@ TaskKey[Unit]("verifyBundle") := {
       sys.error("Expected 'Bundle-Name: sbt-osgi-test' in manifest!" + butWas)
     if (!(lines contains "Bundle-RequiredExecutionEnvironment: JavaSE-1.7,JavaSE-1.8"))
       sys.error("Expected 'Bundle-RequiredExecutionEnvironment: JavaSE-1.7,JavaSE-1.8' in manifest!" + butWas)
-    if (!(lines contains "Bundle-Vendor: com.typesafe.sbt"))
-      sys.error("Expected 'Bundle-Vendor: com.typesafe.sbt' in manifest!" + butWas)
+    if (!(lines contains "Bundle-Vendor: com.github.sbt"))
+      sys.error("Expected 'Bundle-Vendor: com.github.sbt' in manifest!" + butWas)
     if (!(lines contains "Bundle-SymbolicName: com.typesafe.sbt.osgi.test"))
       sys.error("Expected 'Bundle-SymbolicName: com.typesafe.sbt.osgi.test' in manifest!" + butWas)
     if (!(lines contains "Bundle-Version: 1.2.3"))
diff --git a/src/sbt-test/sbt-osgi/test-10-multi-project-dependsOn-includePackage-versions/build.sbt b/src/sbt-test/sbt-osgi/test-10-multi-project-dependsOn-includePackage-versions/build.sbt
index 58dd05d..89c3712 100644
--- a/src/sbt-test/sbt-osgi/test-10-multi-project-dependsOn-includePackage-versions/build.sbt
+++ b/src/sbt-test/sbt-osgi/test-10-multi-project-dependsOn-includePackage-versions/build.sbt
@@ -3,7 +3,7 @@ import com.typesafe.sbt.osgi.OsgiKeys
 
 inThisBuild(
   Seq(
-    organization := "com.typesafe.sbt",
+    organization := "com.github.sbt",
     homepage := Some(url("https://github.com/woq-blended/blended")),
     version := "1.2.3",
     libraryDependencies += "org.osgi" % "org.osgi.core" % "4.3.0" % "provided",