diff --git a/build-native.sh b/build-native.sh
index 36b37be1..3557a9e2 100755
--- a/build-native.sh
+++ b/build-native.sh
@@ -1,28 +1,27 @@
 #!/bin/bash
 
-cd "$GOPATH/src/github.com/calmh/syncthing/"
+cd "$GOPATH/src/github.com/syncthing/syncthing/"
 
 ./build.sh test || exit 1
-./build.sh assets
 
 export GOOS=linux
 export ENVIRONMENT=android
 
 export GOARCH=386
 
-./build.sh
+./build.sh "" -tags noupgrade
 cp syncthing syncthing-x86
 
 export GOARCH=arm
 
 export GOARM=7
-./build.sh
+./build.sh "" -tags noupgrade
 cp syncthing syncthing-armeabi-v7a
 
 export GOARM=5
-./build.sh
+./build.sh "" -tags noupgrade
 cp syncthing syncthing-armeabi
 
 #export GOARCH=mips
-#./build.sh
+#./build.sh "" -tags noupgrade
 #cp syncthing syncthing-mips
diff --git a/build.gradle b/build.gradle
index bada6eec..0b7051d8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -101,8 +101,7 @@ task buildNative(type: Exec) {
 }
 
 task copyNative(type: Copy) {
-	outputs.upToDateWhen { false }
-	def st_dir = System.getenv("GOPATH") + "/src/github.com/calmh/syncthing/";
+	def st_dir = System.getenv("GOPATH") + "/src/github.com/syncthing/syncthing/";
 	from st_dir + 'syncthing-x86', st_dir + 'syncthing-armeabi', st_dir + 'syncthing-armeabi-v7a';
 	into 'libs/'
 	rename('syncthing-x86', 'x86/libsyncthing.so')