diff --git a/build.sbt b/build.sbt
index edd6e0101..f806fdeaf 100644
--- a/build.sbt
+++ b/build.sbt
@@ -2,7 +2,11 @@ name := "scalacheck"
 
 version := "1.10-SNAPSHOT"
 
-organization := "org.scala-tools.testing"
+organization := "org.scalacheck"
+
+licenses := Seq("BSD-style" -> url("http://www.opensource.org/licenses/bsd-license.php"))
+
+homepage := Some(url("http://www.scalacheck.org"))
 
 scalaVersion := "2.9.1"
 
@@ -14,8 +18,30 @@ javacOptions ++= Seq("-Xmx1024M")
 
 scalacOptions += "-deprecation"
 
-publishTo := Some("Scala Tools Nexus" at "http://nexus.scala-tools.org/content/repositories/snapshots/")
-
-// publishTo := Some("Scala Tools Nexus" at "http://nexus.scala-tools.org/content/repositories/releases/")
-
-credentials += Credentials(Path.userHome / ".ivy2" / ".credentials")
+publishTo <<= version { v: String =>
+  val nexus = "https://oss.sonatype.org/"
+  if (v.trim.endsWith("SNAPSHOT"))
+    Some("snapshots" at nexus + "content/repositories/snapshots")
+  else
+    Some("releases" at nexus + "service/local/staging/deploy/maven2")
+}
+
+publishMavenStyle := true
+
+publishArtifact in Test := false
+
+pomIncludeRepository := { _ => false }
+
+pomExtra := (
+  <scm>
+    <url>git@github.com:rickynils/scalacheck.git</url>
+    <connection>scm:git:git@github.com:rickynils/scalacheck.git</connection>
+  </scm>
+  <developers>
+    <developer>
+      <id>rickynils</id>
+      <name>Rickard Nilsson</name>
+      <url>http://www.scalacheck.org</url>
+    </developer>
+  </developers>
+)
diff --git a/project/plugin.sbt b/project/plugin.sbt
new file mode 100644
index 000000000..33505b208
--- /dev/null
+++ b/project/plugin.sbt
@@ -0,0 +1,3 @@
+resolvers += Resolver.url("scalasbt", new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases"))(Resolver.ivyStylePatterns)
+
+addSbtPlugin("com.jsuereth" % "xsbt-gpg-plugin" % "0.5")