diff --git a/arduino-use-system-astyle.patch b/arduino-use-system-astyle.patch
index 982ec85..cd5fb4e 100644
--- a/arduino-use-system-astyle.patch
+++ b/arduino-use-system-astyle.patch
@@ -7,9 +7,9 @@ diff -up Arduino-1.6.4/app/src/cc/arduino/packages/formatter/AStyleInterface.jav
    static {
 -    File astyleLib = new File(Base.getContentFile("lib"), System.mapLibraryName("astylej"));
 -    String astylePath = astyleLib.getAbsolutePath();
-+    File libdir = new File("/usr/lib64");
++    File astyleLib= new File("/usr/lib64/libastyle.so");
 +    String astylePath;
-+    if (libdir.exists() && libdir.isDirectory()) {
++    if (astyleLib.exists()) {
 +      astylePath = "/usr/lib64/libastyle.so";
 +    } else {
 +      astylePath = "/usr/lib/libastyle.so";
diff --git a/arduino.spec b/arduino.spec
index fd664f3..9080f51 100644
--- a/arduino.spec
+++ b/arduino.spec
@@ -1,7 +1,7 @@
 Name:		arduino
 Epoch:		1
 Version:	1.6.4
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	An IDE for Arduino-compatible electronics prototyping platforms
 Group:		Development/Tools
 License:	GPLv2+ and LGPLv2+ and CC-BY-SA
@@ -19,7 +19,7 @@ BuildRequires:	jmdns jsemver apache-commons-net apache-commons-codec git
 BuildRequires:	apache-commons-compress apache-commons-exec apache-commons-lang3
 BuildRequires:	apache-commons-logging jsch guava jackson-annotations jssc
 BuildRequires:	bouncycastle-pg jackson-databind jackson-module-mrbean
-BuildRequires:	jakarta-commons-httpclient objectweb-asm 
+BuildRequires:	jakarta-commons-httpclient objectweb-asm
 Requires:	java >= 1:1.8.0
 Requires:	xorg-x11-fonts-Type1 ecj jna zenity perl polkit ecj jna
 Requires:	jmdns jsemver apache-commons-net apache-commons-codec git
@@ -237,6 +237,9 @@ fi
 %{_datadir}/%{name}/lib/version.txt
 
 %changelog
+* Sat Jul 16 2016 Dennis Chen <barracks510@gmail.com> - 1:1.6.4-8
+- Fixed Bugzilla #1357005
+
 * Sun Mar 13 2016 Dennis Chen <barracks510@gmail.com> - 1:1.6.4-7
 - Fixed Bugzilla #1315104