diff --git a/.gitignore b/.gitignore
index 097ed57..5ad1098 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /arduino-builder-1.0.5.tar.gz
+/arduino-builder-1.3.9.tar.gz
diff --git a/arduino-builder.spec b/arduino-builder.spec
index c1d323f..caa2588 100644
--- a/arduino-builder.spec
+++ b/arduino-builder.spec
@@ -1,10 +1,10 @@
 Name:           arduino-builder
-Version:        1.0.5
-Release:        6%{?dist}
+Version:        1.3.9
+Release:        1%{?dist}
 Summary:        A command line tool for compiling Arduino sketches
 License:        GPLv2+
 URL:            http://www.arduino.cc
-Source0:        https://github.com/arduino/arduino-builder/archive/1.0.5.tar.gz#/arduino-builder-1.0.5.tar.gz
+Source0:        https://github.com/arduino/arduino-builder/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Patch1:         fix-paths-to-ctags-avrdude.patch
 Patch2:         make-tools-flag-optional.patch
 
@@ -70,7 +70,11 @@ install -p src/arduino.cc/builder/hardware/*.txt %{buildroot}%{_datadir}/arduino
 %{_datadir}/arduino/hardware
 
 %changelog
-* Fri Jul 20 2017 Gianluca Sforna <giallu@gmail.com> 1.0.5-6
+* Tue Jul 25 2017 Gianluca Sforna <giallu@gmail.com> 1.3.9-1
+- update to 1.3.9 for Arduino IDE 1.6.7
+- rebase patch
+
+* Fri Jul 21 2017 Gianluca Sforna <giallu@gmail.com> 1.0.5-6
 - revert binaries move, /usr/bin looks like the correct location
 
 * Fri Apr  7 2017 Kir Kolyshkin <kolyshkin@gmail.com> 1.0.5-5
diff --git a/fix-paths-to-ctags-avrdude.patch b/fix-paths-to-ctags-avrdude.patch
index 04d7917..54f8be8 100644
--- a/fix-paths-to-ctags-avrdude.patch
+++ b/fix-paths-to-ctags-avrdude.patch
@@ -1,23 +1,7 @@
-From: Kir Kolyshkin <kolyshkin@gmail.com>
-Subject: arduino-builder: fix tools paths
-
-This patch fixes two things for arduino-builder on Fedora:
-
-1. Makes it use arduino-ctags from /usr/bin (as provided by Fedora).
-Apparently, arduino-builder uses ctags in order to generate all the
-function prototypes and insert those at the beginning of the file to
-be compiled. When ordinary ctags binary is used, prototypes are generated
-without the return type (i.e. "fn(void);" instead of "void fn(void);")
-and it screws the avr-gcc big time.
-
-2. Makes it use avrdude from /usr/bin (as provided by Fedora).
-
-Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
-
-
-diff -ur arduino-builder-1.0.5/src/arduino.cc/builder/hardware/platform.txt arduino-builder-1.0.5-my/src/arduino.cc/builder/hardware/platform.txt
---- arduino-builder-1.0.5/src/arduino.cc/builder/hardware/platform.txt	2015-11-02 01:21:00.000000000 -0800
-+++ arduino-builder-1.0.5-my/src/arduino.cc/builder/hardware/platform.txt	2017-04-06 20:13:19.554750620 -0700
+diff --git a/src/arduino.cc/builder/hardware/platform.txt b/src/arduino.cc/builder/hardware/platform.txt
+index 8adc28a..90ab844 100644
+--- a/src/arduino.cc/builder/hardware/platform.txt
++++ b/src/arduino.cc/builder/hardware/platform.txt
 @@ -1,11 +1,11 @@
  # ctags
  # ------------------------------
@@ -25,11 +9,11 @@ diff -ur arduino-builder-1.0.5/src/arduino.cc/builder/hardware/platform.txt ardu
 -tools.ctags.cmd.path={path}/ctags
 +tools.ctags.path=/usr/bin
 +tools.ctags.cmd.path={path}/arduino-ctags
- tools.ctags.pattern="{cmd.path}" -u --language-force=c++ -f - --c++-kinds=svpf --fields=KSTtzns "{source_file}"
+ tools.ctags.pattern="{cmd.path}" -u --language-force=c++ -f - --c++-kinds=svpf --fields=KSTtzns --line-directives "{source_file}"
  
  # additional entries
 -tools.avrdude.path={runtime.tools.avrdude.path}
 +tools.avrdude.path=/usr/bin
  
  preproc.includes.flags=-w -x c++ -M -MG -MP
- recipe.preproc.includes="{compiler.path}{compiler.cpp.cmd}" {preproc.includes.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.cpp.extra_flags} {build.extra_flags} {includes} "{source_file}"
+ preproc.includes.compatibility_flags={build.mbed_api_include} {build.nRF51822_api_include} {build.ble_api_include} {compiler.libsam.c.flags} {compiler.arm.cmsis.path} {build.variant_system_include}
diff --git a/sources b/sources
index e2dbfa3..5526767 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (arduino-builder-1.0.5.tar.gz) = 6a67133361ae1b8753516842a65ab2172b0e646a239ee2c4a64ba000324455f9271ac3a720ce9009accb032abb6776b20dcf038f2a9b242166e28c3a8e629a05
+SHA512 (arduino-builder-1.3.9.tar.gz) = 06403122455c6b46980ebac56b092218c170325f00938aa55b2084ff64f3d24a90ac4864ebf07c6d8332144404e56c8ca991c4179793f9671d3b56afb1140df2