diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 10a83965..edcd9dbd 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,7 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="com.nutomic.syncthingandroid"
 	android:versionCode="1"
-	android:versionName="0.1" >
+	android:versionName="0.1"
+    android:debuggable="true" >
 	<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="19" />
 	<application android:label="@string/app_name" >
         	<activity
diff --git a/README.md b/README.md
index 0251a167..963958d4 100644
--- a/README.md
+++ b/README.md
@@ -6,4 +6,8 @@ A port of [syncthing](https://github.com/calmh/syncthing) to Android.
 
 Setup [goandroid](https://github.com/eliasnaur/goandroid).
 
+Then, apply `go_src_pkg_flag.diff` to `src/pkg/flag/flag.go`in your local golang source, and compile and install it.
+
+For syncthing, use [my fork](https://github.com/Nutomic/syncthing/tree/android).
+
 To compile, run `./build.sh` (go cross compile) and `ant -f build.xml clean debug install run` (Android package).
diff --git a/go_src_pkg_flag.diff b/go_src_pkg_flag.diff
new file mode 100644
index 00000000..099b6ceb
--- /dev/null
+++ b/go_src_pkg_flag.diff
@@ -0,0 +1,12 @@
+diff -r 19fc7167c67f src/pkg/flag/flag.go
+--- a/src/pkg/flag/flag.go      Sun Apr 20 12:26:05 2014 +0200
++++ b/src/pkg/flag/flag.go      Mon May 05 18:27:37 2014 +0200
+@@ -828,7 +828,7 @@
+ // CommandLine is the default set of command-line flags, parsed from os.Args.
+ // The top-level functions such as BoolVar, Arg, and on are wrappers for the
+ // methods of CommandLine.
+-var CommandLine = NewFlagSet(os.Args[0], ExitOnError)
++var CommandLine = NewFlagSet("", ExitOnError)
+
+ // NewFlagSet returns a new, empty flag set with the specified name and
+ // error handling property.