diff --git a/build.sbt b/build.sbt
index e26e8475..db33d8df 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,7 +1,3 @@
-javacOptions in Compile ++= Seq("-source", "1.6",  "-target", "1.6") 
-
-javacOptions in doc ++= Seq("-source", "1.6") 
-
 libraryDependencies ++= Seq(
   "com.google.android" % "support-v4" % "r12",
   "com.google.android.analytics" % "analytics" % "2.0beta4",
diff --git a/project/Build.scala b/project/Build.scala
index 3f8e4730..d4526714 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -2,7 +2,7 @@ import sbt._
 import sbt.Keys._
 
 import sbtandroid._
-import sbtandroid.AndroidKeys._
+import sbtandroid.AndroidPlugin._
 
 object App {
   val version = "1.8.2"
@@ -17,7 +17,7 @@ object General {
     versionCode := App.versionCode,
     scalaVersion := "2.9.2",
     compileOrder := CompileOrder.JavaThenScala,
-    platformName in Android := "android-16",
+    platformName := "android-16",
     resolvers += "madeye-maven" at "http://madeye-maven-repository.googlecode.com/git",
     resolvers += "central-maven" at "http://repo.maven.apache.org/maven2"
   )
@@ -28,22 +28,23 @@ object General {
           "-keep interface com.actionbarsherlock.** { *; }",
           "-keep class org.jraf.android.backport.** { *; }",
           "-keep class com.github.shadowsocks.** { *; }",
-          "-keepattributes *Annotation*").mkString(" ")
+          "-keepattributes *Annotation*")
 
   val proguardSettings = Seq (
-    useProguard in Android := true,
-    proguardOption in Android := pgOptions
+    useProguard := true,
+    proguardOptions := pgOptions
+  )
+
+  val miscSettings = Seq (
+    cachePasswords := true,
+    publicServer := "127.0.0.1"
   )
 
   lazy val fullAndroidSettings =
     General.settings ++
-    AndroidProject.androidSettings ++
-    TypedResources.settings ++
+    AndroidPlugin.androidDefaults ++
     proguardSettings ++
-    AndroidManifestGenerator.settings ++
-    AndroidMarketPublish.settings ++ Seq (
-      cachePasswords in Android := true
-    )
+    miscSettings
 }
 
 object AndroidBuild extends Build {
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 119536e9..b17b415f 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -4,6 +4,6 @@ resolvers += Resolver.url("scalasbt releases", new URL("http://scalasbt.artifact
 
 resolvers += Resolver.url("madeye private releases", new URL("http://madeye-maven-repository.googlecode.com/git/ivy"))(Resolver.ivyStylePatterns)
 
-addSbtPlugin("org.scala-sbt" % "sbt-android" % "0.6.4-SNAPSHOT")
+addSbtPlugin("org.scala-sbt" % "sbt-android" % "0.7.1-SNAPSHOT")
 
 addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.4.0")