diff --git a/.gitignore b/.gitignore
index bfedc60..41fca93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /phd2-2.6.4-purged.tar.xz
 /phd2-2.6.5-purged.tar.xz
+/phd2-2.6.6-purged.tar.xz
diff --git a/generate-tarball.sh b/generate-tarball.sh
index 15f7ce8..ed87723 100755
--- a/generate-tarball.sh
+++ b/generate-tarball.sh
@@ -10,7 +10,6 @@ rm -rf phd2-$VERSION/extra_frameworks
 rm -rf phd2-$VERSION/thirdparty/*.zip
 rm -rf phd2-$VERSION/thirdparty/*.tar.gz
 rm -rf phd2-$VERSION/thirdparty/*.tar.bz2
-rm -rf phd2-$VERSION/thirdparty/extra_frameworks
 rm -rf phd2-$VERSION/thirdparty/frameworks
 rm -rf phd2-$VERSION/thirdparty/HID_Utilities
 rm -rf phd2-$VERSION/thirdparty/include
@@ -18,6 +17,7 @@ rm -rf phd2-$VERSION/thirdparty/openssag
 find . -name "*.dll" -type f -delete
 find . -name "*.lib" -type f -delete
 find . -name "*.a" -type f -delete
+find . -name "*.so" -type f -delete
 rm -rf phd2-$VERSION/cameras/qhyccdlibs/qhyfirmware.zip
 
 tar -cJvf phd2-$VERSION-purged.tar.xz phd2-$VERSION 
diff --git a/phd2.spec b/phd2.spec
index a6eb072..b3c12d5 100644
--- a/phd2.spec
+++ b/phd2.spec
@@ -1,6 +1,6 @@
 Name:           phd2
-Version:        2.6.5
-Release:        4%{?dist}
+Version:        2.6.6
+Release:        1%{?dist}
 Summary:        Telescope guiding software
 # Main program files are BSD licensed
 # Some components have different licenses:
@@ -19,9 +19,9 @@ Source1:        generate-tarball.sh
 # Use C++14 flag
 Patch99:        phd2_cflags.patch
 
-# Backported patch from upstream to disable camera firmwares we removed from sources
-# https://github.com/OpenPHDGuiding/phd2/issues/690
-Patch100:       phd2_2.6.5_disable_cams.patch
+# Disable OpenSSAG
+# https://github.com/OpenPHDGuiding/phd2/pull/758
+Patch100:       phd2_2.6.6_disable_openssag.patch
 
 BuildRequires:  cmake
 BuildRequires:  desktop-file-utils
@@ -57,8 +57,6 @@ or spectroscopy.
 find icons -type f -print0 |xargs -0 chmod -x
 chmod -x PHD_2.0_Architecture.docx
 
-# Fix line ending
-dos2unix README-PHD2.txt
 
 %build
 mkdir -p %{_target_platform}
@@ -81,18 +79,14 @@ popd
 %find_lang %{name}
 
 %check
-# Tests are failing on x86 with GCC >= 7
-# https://github.com/OpenPHDGuiding/phd2/issues/608
-%ifnarch %{ix86}
 env CTEST_OUTPUT_ON_FAILURE=1 make test -C %{_target_platform}
-%endif
 
 desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
 appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}.appdata.xml
 
 
 %files -f %{name}.lang
-%doc README.txt README-PHD2.txt PHD_2.0_Architecture.docx
+%doc README.txt PHD_2.0_Architecture.docx
 %license LICENSE.txt
 %{_bindir}/*
 %{_datadir}/metainfo/%{name}.appdata.xml
@@ -102,6 +96,10 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}.
 
 
 %changelog
+* Sat Mar 30 2019 Mattia Verga <mattia.verga@protonmail.com> - 2.6.6-1
+- Upgrade to 2.6.6
+- Enable tests on i686
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/phd2_2.6.5_disable_cams.patch b/phd2_2.6.5_disable_cams.patch
deleted file mode 100644
index db633c2..0000000
--- a/phd2_2.6.5_disable_cams.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From 0d87a84540e90bb17e6d4183fd32d422c410861f Mon Sep 17 00:00:00 2001
-From: Andy Galasso <andy.galasso@gmail.com>
-Date: Mon, 7 May 2018 12:19:46 -0400
-Subject: [PATCH] Linux: add option to exclude binary drivers from build (ZWO
- and QHY)
-
----
- cameras.h                   |   4 +-
- thirdparty/thirdparty.cmake | 104 +++++++++++++++++++++++---------------------
- 2 files changed, 58 insertions(+), 50 deletions(-)
-
-diff --git a/cameras.h b/cameras.h
-index 4d4ba67c..a7cdff02 100644
---- a/cameras.h
-+++ b/cameras.h
-@@ -109,7 +109,9 @@
- #  define QHY_CAMERA
- # endif
- # define INDI_CAMERA
--# define ZWO_ASI
-+# ifdef HAVE_ZWO_CAMERA
-+#  define ZWO_ASI
-+# endif
- # define SXV
- # ifdef HAVE_SBIG_CAMERA
- #   define SBIG
-diff --git a/thirdparty/thirdparty.cmake b/thirdparty/thirdparty.cmake
-index 2bb1de8c..88157b2d 100644
---- a/thirdparty/thirdparty.cmake
-+++ b/thirdparty/thirdparty.cmake
-@@ -1207,60 +1207,66 @@ endif()  # APPLE
- #############################################
- if(UNIX AND NOT APPLE)
- 
-- if (CMAKE_SYSTEM_PROCESSOR MATCHES "^armv6(.*)")
--    set(arch "armv6")
--    set(qhyarch "armv6")
-- elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^armv7(.*)|arm64|aarch64|^armv8(.*)")
--  if(CMAKE_SIZEOF_VOID_P EQUAL 8)
--    set(arch "armv8")
--    set(qhyarch "armv8")
--  else()
--    set(arch "armv7")
--    set(qhyarch "armv7")
--  endif()
-- elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "x86|X86|amd64|AMD64|i.86")
--  if(CMAKE_SIZEOF_VOID_P EQUAL 8)
--    set(arch "x64")
--    set(qhyarch "x86_64")
--  else()
--    set(arch "x86")
--    set(qhyarch "x86_32")
--  endif()
-- else()
--   message(FATAL_ERROR "unknown system architecture")
-- endif()
--
--  find_path(ZWO_INCLUDE_DIR ASICamera2.h
--     NO_DEFAULT_PATHS
--     PATHS ${PHD_PROJECT_ROOT_DIR}/cameras
--  )
-+  if (NOT OPENSOURCE_ONLY)
-+
-+    if (CMAKE_SYSTEM_PROCESSOR MATCHES "^armv6(.*)")
-+      set(zwoarch "armv6")
-+      set(qhyarch "armv6")
-+    elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^armv7(.*)|arm64|aarch64|^armv8(.*)")
-+      if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-+        set(zwoarch "armv8")
-+        set(qhyarch "armv8")
-+      else()
-+        set(zwoarch "armv7")
-+        set(qhyarch "armv7")
-+      endif()
-+    elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "x86|X86|amd64|AMD64|i.86")
-+      if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-+        set(zwoarch "x64")
-+        set(qhyarch "x86_64")
-+      else()
-+        set(zwoarch "x86")
-+        set(qhyarch "x86_32")
-+      endif()
-+    else()
-+      message(FATAL_ERROR "unknown system architecture")
-+    endif()
- 
--  find_library(asiCamera2
--                NAMES ASICamera2
--                NO_DEFAULT_PATHS
--                PATHS ${PHD_PROJECT_ROOT_DIR}/cameras/zwolibs/${arch})
--  if(NOT asiCamera2)
--    message(FATAL_ERROR "Cannot find the asiCamera2 drivers")
--  endif()
--  message(STATUS "Found ASICamera2 lib ${asiCamera2}")
--  set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} ${asiCamera2})
-+    find_path(ZWO_INCLUDE_DIR ASICamera2.h
-+      NO_DEFAULT_PATHS
-+      PATHS ${PHD_PROJECT_ROOT_DIR}/cameras
-+    )
- 
--  if(IS_DIRECTORY ${PHD_PROJECT_ROOT_DIR}/cameras/qhyccdlibs/linux/${qhyarch})
--    add_definitions(-DHAVE_QHY_CAMERA=1)
-+    find_library(asiCamera2
-+                 NAMES ASICamera2
-+                 NO_DEFAULT_PATHS
-+                 PATHS ${PHD_PROJECT_ROOT_DIR}/cameras/zwolibs/${zwoarch})
- 
--    # be careful not to pick up any other qhy lib on the system
--    find_library( qhylib
--                  NAMES qhy
--                  NO_DEFAULT_PATH
--                  PATHS ${PHD_PROJECT_ROOT_DIR}/cameras/qhyccdlibs/linux/${qhyarch})
--    if(NOT qhylib)
--      message(FATAL_ERROR "Cannot find the qhy SDK libs")
-+    if(NOT asiCamera2)
-+      message(FATAL_ERROR "Cannot find the asiCamera2 drivers")
-     endif()
--    set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} ${qhylib})
--  endif()
-+    message(STATUS "Found ASICamera2 lib ${asiCamera2}")
-+    add_definitions(-DHAVE_ZWO_CAMERA=1)
-+    set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} ${asiCamera2})
-+
-+    if(IS_DIRECTORY ${PHD_PROJECT_ROOT_DIR}/cameras/qhyccdlibs/linux/${qhyarch})
-+      add_definitions(-DHAVE_QHY_CAMERA=1)
-+
-+      # be careful not to pick up any other qhy lib on the system
-+      find_library(qhylib
-+                   NAMES qhy
-+                   NO_DEFAULT_PATH
-+                   PATHS ${PHD_PROJECT_ROOT_DIR}/cameras/qhyccdlibs/linux/${qhyarch})
-+      if(NOT qhylib)
-+        message(FATAL_ERROR "Cannot find the qhy SDK libs")
-+      endif()
-+      set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} ${qhylib})
-+    endif()
-+
-+    # temporarily disable qhy camera pending fix for link error on Ubuntu Trusty
-+    remove_definitions(-DHAVE_QHY_CAMERA=1)
- 
--  # temporarily disable qhy camera pending fix for link error on Ubuntu Trusty
--  remove_definitions(-DHAVE_QHY_CAMERA=1)
-+  endif()  # OPENSOURCE_ONLY
- 
-   # math library is needed, and should be one of the last things to link to here
-   find_library(mathlib NAMES m)
diff --git a/phd2_2.6.6_disable_openssag.patch b/phd2_2.6.6_disable_openssag.patch
new file mode 100644
index 0000000..92656f2
--- /dev/null
+++ b/phd2_2.6.6_disable_openssag.patch
@@ -0,0 +1,43 @@
+diff -U 3 -dHrN -- a/thirdparty/thirdparty.cmake b/thirdparty/thirdparty.cmake
+--- a/thirdparty/thirdparty.cmake	2019-03-24 19:50:39.000000000 +0100
++++ b/thirdparty/thirdparty.cmake	2019-03-29 18:30:18.853081815 +0100
+@@ -1295,23 +1295,23 @@
+     # temporarily disable qhy camera pending fix for link error on Ubuntu Trusty
+     remove_definitions(-DHAVE_QHY_CAMERA=1)
+ 
+-  endif()  # OPENSOURCE_ONLY
++    set(LIBOPENSSAG openssag)
++    set(libopenssag_dir ${thirdparty_dir}/${LIBOPENSSAG}/src)
++    include_directories(${libopenssag_dir})
++    set(libOPENSSAG_SRC
++      ${libopenssag_dir}/firmware.h
++      ${libopenssag_dir}/loader.cpp
++      ${libopenssag_dir}/openssag_priv.h
++      ${libopenssag_dir}/openssag.cpp
++      ${libopenssag_dir}/openssag.h
++      )
++    add_library(OpenSSAG ${libOPENSSAG_SRC})
++    target_link_libraries(OpenSSAG openphd_libusb)
++    target_include_directories(OpenSSAG PRIVATE ${thirdparty_dir}/${LIBOPENSSAG}/src)
++    set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} OpenSSAG)
++    set_property(TARGET OpenSSAG PROPERTY FOLDER "Thirdparty/")
+ 
+-  set(LIBOPENSSAG openssag)
+-  set(libopenssag_dir ${thirdparty_dir}/${LIBOPENSSAG}/src)
+-  include_directories(${libopenssag_dir})
+-  set(libOPENSSAG_SRC
+-    ${libopenssag_dir}/firmware.h
+-    ${libopenssag_dir}/loader.cpp
+-    ${libopenssag_dir}/openssag_priv.h
+-    ${libopenssag_dir}/openssag.cpp
+-    ${libopenssag_dir}/openssag.h
+-    )
+-  add_library(OpenSSAG ${libOPENSSAG_SRC})
+-  target_link_libraries(OpenSSAG openphd_libusb)
+-  target_include_directories(OpenSSAG PRIVATE ${thirdparty_dir}/${LIBOPENSSAG}/src)
+-  set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} OpenSSAG)
+-  set_property(TARGET OpenSSAG PROPERTY FOLDER "Thirdparty/")
++  endif()  # OPENSOURCE_ONLY
+ 
+   # math library is needed, and should be one of the last things to link to here
+   find_library(mathlib NAMES m)
diff --git a/sources b/sources
index 21f6d85..e806d51 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (phd2-2.6.5-purged.tar.xz) = 7ec3d92d5181dca6f735f923940a464d31b1138a143e3bf31d6a6e231b8b77a504c172f2b6f833f2cab43051f0397d1901f6bc8780b92e16dbd6d556d319e92f
+SHA512 (phd2-2.6.6-purged.tar.xz) = 72ae939c1ed4917d35a7620a02b92bea64ee1e2f8d1b94db6ff11d7402829f6994cd6a8bede292e128d421a13ede718c34b2a898695111bbbe92a35d390349eb