diff --git a/srcpkgs/arduino/patches/astyle_fix.patch b/srcpkgs/arduino/patches/astyle_fix.patch
new file mode 100644
index 0000000000..7b07f57442
--- /dev/null
+++ b/srcpkgs/arduino/patches/astyle_fix.patch
@@ -0,0 +1,34 @@
+--- astyle/src/astyle_main.cpp	2017-05-30 20:26:37.000000000 -0400
++++ astyle/src/astyle_main.cpp	2019-09-11 20:38:02.155936887 -0400
+@@ -3749,7 +3749,7 @@
+ // called by a java program to get the version number
+ // the function name is constructed from method names in the calling java program
+ extern "C"  EXPORT
+-jstring STDCALL Java_AStyleInterface_AStyleGetVersion(JNIEnv* env, jclass)
++jstring STDCALL Java_cc_arduino_packages_formatter_AStyleInterface_AStyleGetVersion(JNIEnv* env, jclass)
+ {
+ 	return env->NewStringUTF(g_version);
+ }
+@@ -3757,7 +3757,7 @@
+ // called by a java program to format the source code
+ // the function name is constructed from method names in the calling java program
+ extern "C"  EXPORT
+-jstring STDCALL Java_AStyleInterface_AStyleMain(JNIEnv* env,
++jstring STDCALL Java_cc_arduino_packages_formatter_AStyleInterface_AStyleMain(JNIEnv* env,
+                                                 jobject obj,
+                                                 jstring textInJava,
+                                                 jstring optionsJava)
+--- astyle/src/astyle_main.h	2017-05-30 20:26:37.000000000 -0400
++++ astyle/src/astyle_main.h	2019-09-11 20:39:15.953536523 -0400
+@@ -406,9 +406,9 @@
+ char* STDCALL javaMemoryAlloc(unsigned long memoryNeeded);
+ // the following function names are constructed from method names in the calling java program
+ extern "C" EXPORT
+-jstring STDCALL Java_AStyleInterface_AStyleGetVersion(JNIEnv* env, jclass);
++jstring STDCALL Java_cc_arduino_packages_formatter_AStyleInterface_AStyleGetVersion(JNIEnv* env, jclass);
+ extern "C" EXPORT
+-jstring STDCALL Java_AStyleInterface_AStyleMain(JNIEnv* env,
++jstring STDCALL Java_cc_arduino_packages_formatter_AStyleInterface_AStyleMain(JNIEnv* env,
+                                                 jobject obj,
+                                                 jstring textInJava,
+                                                 jstring optionsJava);
diff --git a/srcpkgs/arduino/patches/disable-dependency-build.patch b/srcpkgs/arduino/patches/disable-dependency-build.patch
index ac27de7601..970decc78e 100644
--- a/srcpkgs/arduino/patches/disable-dependency-build.patch
+++ b/srcpkgs/arduino/patches/disable-dependency-build.patch
@@ -1,5 +1,5 @@
---- build/build.xml.orig	2019-02-26 02:16:33.845398910 +0100
-+++ build/build.xml	2019-02-26 02:22:56.667235290 +0100
+--- Arduino-1.8.9/build/build.xml.orig	2019-02-26 02:16:33.845398910 +0100
++++ Arduino-1.8.9/build/build.xml	2019-02-26 02:22:56.667235290 +0100
 @@ -649,15 +649,6 @@
    </target>
  
diff --git a/srcpkgs/arduino/template b/srcpkgs/arduino/template
index ed5954c919..d877176f70 100644
--- a/srcpkgs/arduino/template
+++ b/srcpkgs/arduino/template
@@ -1,9 +1,11 @@
 # Template file for 'arduino'
 pkgname=arduino
 version=1.8.9
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* arm*"
-wrksrc=Arduino-$version
+wrksrc=$pkgname-$version
+create_wrksrc=yes
+build_wrksrc=Arduino-$version
 hostmakedepends="apache-ant unzip ImageMagick openjdk"
 depends="virtual?java-runtime avr-binutils avr-gcc avr-libc avrdude"
 short_desc="IDE for the arduino open-source electronics prototyping platform"