diff -up Arduino-1.8.3/app/src/cc/arduino/packages/formatter/AStyleInterface.java.system-astyle Arduino-1.8.3/app/src/cc/arduino/packages/formatter/AStyleInterface.java
--- Arduino-1.8.3/app/src/cc/arduino/packages/formatter/AStyleInterface.java.system-astyle	2017-05-31 11:03:10.000000000 -0400
+++ Arduino-1.8.3/app/src/cc/arduino/packages/formatter/AStyleInterface.java	2017-08-14 16:03:31.638298899 -0400
@@ -41,7 +41,11 @@ public class AStyleInterface {
       loadLib(Base.getContentFile(System.mapLibraryName("msvcp100")));
       loadLib(Base.getContentFile(System.mapLibraryName("msvcr100")));
     }
-    loadLib(new File(Base.getContentFile("lib"), System.mapLibraryName("astylej")));
+    File astyleLib = new File("/usr/lib64/libastyle.so.3");
+    if (! astyleLib.exists()) {
+      astyleLib = new File("/usr/lib/libastyle.so.3");
+    }
+    loadLib(astyleLib);
   }
 
   private static void loadLib(File lib) {
diff -up Arduino-1.8.3/build/build.xml.system-astyle Arduino-1.8.3/build/build.xml
--- Arduino-1.8.3/build/build.xml.system-astyle	2017-08-14 16:16:51.094005289 -0400
+++ Arduino-1.8.3/build/build.xml	2017-08-14 16:17:52.870525170 -0400
@@ -641,14 +641,14 @@
   </target>
 
   <target name="linux-libastyle-x86" depends="linux-build" description="Download libastyle.so for x86/x64 arch">
-    <antcall target="unzip">
+    <!--antcall target="unzip">
       <param name="archive_file" value="./libastylej-2.05.1-3.zip" />
       <param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-3.zip" />
       <param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
       <param name="dest_folder" value="${staging_folder}" />
     </antcall>
     <copy file="linux/libastylej-2.05.1/libastylej${arch-bits}.so" tofile="linux/work/lib/libastylej.so" />
-    <chmod perm="755" file="linux/work/lib/libastylej.so" />
+    <chmod perm="755" file="linux/work/lib/libastylej.so" /-->
 
     <antcall target="portable-${portable}">
       <param name="parentdir" value="linux/work" />
@@ -666,14 +666,14 @@
   </target>
 
   <target name="linux-libastyle-arm" depends="linux-build" description="Download libastyle.so for ARM">
-    <antcall target="unzip">
+    <!--antcall target="unzip">
       <param name="archive_file" value="./libastylej-2.05.1-3.zip" />
       <param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-3.zip" />
       <param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
       <param name="dest_folder" value="${staging_folder}" />
     </antcall>
     <copy file="linux/libastylej-2.05.1/libastylej_arm.so" tofile="linux/work/lib/libastylej.so" />
-    <chmod perm="755" file="linux/work/lib/libastylej.so" />
+    <chmod perm="755" file="linux/work/lib/libastylej.so" /-->
 
     <antcall target="portable-${portable}">
       <param name="parentdir" value="linux/work" />