diff --git a/build.sbt b/build.sbt
index d2b7cb461..7e21530bc 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,12 +1,6 @@
-import AssemblyKeys._
-
-assemblySettings
-
-
 lazy val commonSettings = Seq(
-  organization := "com.psforever",
+  organization := "net.psforever",
   version := "1.0",
-  jarName in assembly := "pslogin.jar",
   scalaVersion := "2.11.7",
   scalacOptions := Seq("-unchecked", "-deprecation", "-encoding", "utf8"),
   resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",
@@ -28,7 +22,7 @@ lazy val pslogin = (project in file("pslogin")).
   settings(commonSettings: _*).
   settings(
     name := "pslogin"
-  ).settings(assemblySettings: _*).dependsOn(common)
+  ).settings(packAutoSettings: _*).dependsOn(common)
 
 lazy val common = (project in file("common")).
   settings(commonSettings: _*).
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 35619cb7e..2837da3a3 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,3 +1,3 @@
 logLevel := Level.Warn
 
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.11.2")
\ No newline at end of file
+addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.7.9")