diff --git a/.gitignore b/.gitignore
index d350393..65cebc5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 indi-apogee_1.0.tar.gz
+/indi-apogee-1.3.1.tar.gz
diff --git a/indi-apogee-cfitsio.patch b/indi-apogee-cfitsio.patch
deleted file mode 100644
index 4d667cd..0000000
--- a/indi-apogee-cfitsio.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur indi-apogee-1.0/CMakeLists.txt indi-apogee-1.0.new/CMakeLists.txt
---- indi-apogee-1.0/CMakeLists.txt	2008-11-18 10:43:03.000000000 +0100
-+++ indi-apogee-1.0.new/CMakeLists.txt	2009-02-14 16:58:12.000000000 +0100
-@@ -9,9 +9,10 @@
- include (MacroLogFeature)
- include (MacroBoolTo01)
- include (CheckIncludeFiles)
-+include (FindPkgConfig)
- 
- find_package(USB REQUIRED)
--find_package(CFITSIO REQUIRED)
-+pkg_check_modules(CFITSIO REQUIRED cfitsio)
- find_package(INDI REQUIRED)
- find_package(APOGEE REQUIRED)
- find_package(ZLIB REQUIRED)
-@@ -23,7 +24,7 @@
- include_directories( ${CMAKE_CURRENT_BINARY_DIR})
- include_directories( ${CMAKE_SOURCE_DIR})
- include_directories( ${INDI_INCLUDE_DIR})
--include_directories( ${CFITSIO_INCLUDE_DIR})
-+include_directories( ${CFITSIO_INCLUDE_DIRS})
- include_directories( ${APOGEE_INCLUDE_DIR})
- 
- if (NOVA_FOUND)
diff --git a/indi-apogee-dso.patch b/indi-apogee-dso.patch
deleted file mode 100644
index c3f2bf4..0000000
--- a/indi-apogee-dso.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur indi-apogee-1.0/CMakeLists.txt indi-apogee-1.0.new/CMakeLists.txt
---- indi-apogee-1.0/CMakeLists.txt	2010-02-18 22:23:13.000000000 +0100
-+++ indi-apogee-1.0.new/CMakeLists.txt	2010-02-18 22:23:00.000000000 +0100
-@@ -39,8 +39,8 @@
- add_executable(indi_apogeeu_ccd ${indiapogee_SRCS})
- add_executable(indi_apogeee_ccd ${indiapogee_SRCS})
- 
--target_link_libraries(indi_apogeeu_ccd ${INDI_LIBRARIES} ${INDI_DRIVER_LIBRARIES} ${CFITSIO_LIBRARIES} ${APOGEEU_LIBRARIES} z)
--target_link_libraries(indi_apogeee_ccd ${INDI_LIBRARIES} ${INDI_DRIVER_LIBRARIES} ${CFITSIO_LIBRARIES} ${APOGEEE_LIBRARIES} z)
-+target_link_libraries(indi_apogeeu_ccd ${INDI_LIBRARIES} ${INDI_DRIVER_LIBRARIES} ${CFITSIO_LIBRARIES} ${APOGEEU_LIBRARIES} m z)
-+target_link_libraries(indi_apogeee_ccd ${INDI_LIBRARIES} ${INDI_DRIVER_LIBRARIES} ${CFITSIO_LIBRARIES} ${APOGEEE_LIBRARIES} m z)
- 
- if (NOVA_FOUND)
-   target_link_libraries(indi_apogeeu_ccd ${NOVA_LIBRARIES})
diff --git a/indi-apogee-format-spec.patch b/indi-apogee-format-spec.patch
deleted file mode 100644
index 22324af..0000000
--- a/indi-apogee-format-spec.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur indi-apogee-1.0/indialta.c indi-apogee-1.0.format/indialta.c
---- indi-apogee-1.0/indialta.c	2008-11-18 10:43:03.000000000 +0100
-+++ indi-apogee-1.0.format/indialta.c	2014-01-09 17:39:36.021682769 +0100
-@@ -314,7 +314,7 @@
- 				IUResetSwitch (&FanSpeedSP);
- 				FanSpeedSP.sp[fs].s = ISS_ON;
- 				FanSpeedSP.s = IPS_OK;
--				IDSetSwitch (&FanSpeedSP, smsg);
-+				IDSetSwitch (&FanSpeedSP, "%s", smsg);
- 		    	}
- 
- 		    break;
-@@ -854,7 +854,7 @@
- 	}
- 
- 	TemperatureRNP.np[0].value = cnow;
--	IDSetNumber (&TemperatureRNP, msg);
-+	IDSetNumber (&TemperatureRNP, "%s", msg);
- 
- 	lasts = status;
- 
diff --git a/indi-apogee-generate-tarball.sh b/indi-apogee-generate-tarball.sh
new file mode 100755
index 0000000..e7fbf37
--- /dev/null
+++ b/indi-apogee-generate-tarball.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+#
+# Starting with release 1.3 INDI ships libindi and 3rdparty stuff (with nonfree
+# BLOBs) in one big tar archive. Thus we have to generate a clean one for
+# Fedora containing only the free library itself.
+
+NAME="indi-apogee"
+ORIG=indi-$1
+NEW=$NAME-$1
+
+echo "Generating clean tar for $NAME"
+echo "Unpack original tar"
+tar -xzf $ORIG.tar.gz
+echo "Packing new tar for $NAME"
+mv $ORIG/3rdparty/$NAME $NEW
+cp -r $ORIG/cmake_modules $NEW/cmake_modules
+tar -cpzf $NEW.tar.gz $NEW
+echo "Clean up"
+rm -rf $ORIG $NEW
+echo "Done! Generated $NEW.tar.gz"
diff --git a/indi-apogee.spec b/indi-apogee.spec
index 44afad1..05e0d85 100644
--- a/indi-apogee.spec
+++ b/indi-apogee.spec
@@ -1,19 +1,16 @@
 Name: indi-apogee
-Version: 1.0
-Release: 21%{?dist}
+Version: 1.3.1
+Release: 1%{?dist}
 Summary: The INDI driver for Apogee Alta (U & E) line of CCDs
 
-Group: Development/Libraries
 License: LGPLv2+
-URL: http://indi.sourceforge.net/
-
-Source0: http://downloads.sourceforge.net/indi/%{name}_%{version}.tar.gz
-Patch0: indi-apogee-cfitsio.patch
-
-# https://sourceforge.net/tracker/?func=detail&aid=2954467&group_id=90275&atid=593019
-Patch1: indi-apogee-dso.patch
-# Fixes bz #1037130
-Patch2: indi-apogee-format-spec.patch
+URL: http://indilib.org
+# Upstream provides one big tar including nonfree BLOBs for other drivers.
+# Thus we have to generate a clean tar by ourself containing only
+# the free driver to be packaged using
+# ./indi-apogee-generate-tarball.sh 1.3.1
+Source0:        %{name}-%{version}.tar.gz
+Source1:        %{name}-generate-tarball.sh
 
 BuildRequires: cmake libusb-devel cfitsio-devel zlib-devel
 BuildRequires: libindi-static libindi-devel libapogee-devel libnova-devel
@@ -24,9 +21,6 @@ Alta (U & E) line of CCDs.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 %cmake
@@ -36,11 +30,15 @@ make VERBOSE=1 %{?_smp_mflags}
 make install DESTDIR=%{buildroot}
 
 %files
-%doc AUTHORS ChangeLog COPYING.LIB README
+%license COPYING.LIB
+%doc AUTHORS README
 %{_bindir}/*
 %{_datadir}/indi/*
 
 %changelog
+* Thu Dec 15 2016 Christian Dersch <lupinix@mailbox.org> - 1.3.1-1
+- new version
+
 * Tue Feb 02 2016 Christian Dersch <lupinix@mailbox.org> - 1.0-21
 - Rebuild for libindi 1.2.0
 
diff --git a/sources b/sources
index 8415e37..4505e52 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3f7e94e0320207b7b2a059fda414ea30  indi-apogee_1.0.tar.gz
+SHA512 (indi-apogee-1.3.1.tar.gz) = d3d4053ce781fd9eab77e8053e060076c389fbf214a7557587875ef3d293476a79a9df127ab12fe3a3c343570c30da6975b44da30ad7d985e08e17451e4974c2