diff --git a/srcpkgs/arduino/files/arduino.desktop b/srcpkgs/arduino/files/arduino.desktop
new file mode 100644
index 00000000000..180dea615bf
--- /dev/null
+++ b/srcpkgs/arduino/files/arduino.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Arduino
+GenericName=Arduino IDE
+Comment=The open-source Arduino environment
+TryExec=arduino
+Exec=arduino %U
+Icon=arduino
+Type=Application
+Terminal=false
+MimeType=text/x-arduino;
+Categories=Development;
diff --git a/srcpkgs/arduino/patches/disable-astyle-download.patch b/srcpkgs/arduino/patches/disable-astyle-download.patch
new file mode 100644
index 00000000000..58002176210
--- /dev/null
+++ b/srcpkgs/arduino/patches/disable-astyle-download.patch
@@ -0,0 +1,18 @@
+--- build/build.xml.orig	2015-06-10 01:12:20.791398588 +0200
++++ build/build.xml	2015-06-10 01:12:36.227399295 +0200
+@@ -600,15 +600,6 @@
+ 
+     <copy todir="linux/work" file="linux/dist/arduino" />
+     <chmod perm="755" file="linux/work/arduino" />
+-
+-    <antcall target="unzip">
+-      <param name="archive_file" value="./libastylej-2.05.zip" />
+-      <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.zip" />
+-      <param name="final_folder" value="${staging_folder}/libastylej" />
+-      <param name="dest_folder" value="${staging_folder}" />
+-    </antcall>
+-    <copy file="linux/libastylej/libastylej${arch-bits}.so" tofile="linux/work/lib/libastylej.so" />
+-    <chmod perm="755" file="linux/work/lib/libastylej.so" />
+   </target>
+ 
+   <target name="linux32-build" depends="linux-build" description="Build linux (32-bit) version">
diff --git a/srcpkgs/arduino/template b/srcpkgs/arduino/template
new file mode 100644
index 00000000000..2e7513201a3
--- /dev/null
+++ b/srcpkgs/arduino/template
@@ -0,0 +1,52 @@
+# Template file for 'arduino'
+pkgname=arduino
+version=1.6.4
+revision=1
+makedepends="openjdk"
+hostmakedepends="apache-ant unzip ImageMagick"
+depends="virtual?java-runtime avr-binutils avr-gcc avr-libc avrdude"
+short_desc="IDE for the arduino open-source electronics prototyping platform"
+maintainer="Enno Boland <gottox@voidlinux.eu>"
+license="GPL-2, LGPL-2"
+homepage="http://arduino.cc/"
+distfiles="https://github.com/arduino/Arduino/archive/${version}.tar.gz
+ ${SOURCEFORGE_SITE}/astyle/astyle_2.05.1_linux.tar.gz"
+checksum="393a8a22b2e6370d0774a4a42c69fd47df9dbfaed6badc6a1d80c559b17e7c4d
+ fbdfc6f1966a972d19a215927266c76d4183eee235ed1e2bd7ec551c2a270eac"
+. /etc/profile.d/apache-ant.sh
+. /etc/profile.d/10_openjdk.sh
+CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/lib/jvm/openjdk/include/linux \
+ -I${XBPS_CROSS_BASE}/usr/lib/jvm/openjdk/include"
+nostrip=yes
+wrksrc=Arduino-$version
+
+do_build() {
+	mkdir -p build/linux/work/lib
+	cd ../astyle/build/gcc
+	make ${makejobs} java
+	cp bin/libastyle-2.05.1j.so \
+		../../../Arduino-$version/build/linux/work/lib/libastylej.so
+	cd  ../../../Arduino-$version/build
+	ant linux-build
+	sed -i -e "s#{runtime\.tools\.[^.]*\.path}#/usr#g" \
+		-e "s#\(tools\.avrdude\.config\.path=\).*#\1/etc/avrdude.conf#" \
+		linux/work/hardware/arduino/avr/platform.txt \
+		linux/work/hardware/platform.keys.rewrite.txt
+	convert linux/work/lib/arduino_icon.ico icon.png
+}
+
+do_install() {
+	vmkdir usr/lib
+	vmkdir usr/bin
+	vcopy build/linux/work usr/lib/arduino
+	ln -sf /usr/lib/arduino/arduino ${DESTDIR}/usr/bin/arduino
+	for i in build/icon*.png; do
+		size=`identify $i | cut -d' ' -f 3`
+		case $size in
+			16x16|32x32|48x48|256x256)
+				vinstall $i 644 usr/share/icons/hicolor/${size}/apps arduino.png
+			;;
+		esac
+	done
+	vinstall ${FILESDIR}/arduino.desktop 644 usr/share/applications
+}