diff --git a/indi-aagcloudwatcher-generate-tarball.sh b/indi-aagcloudwatcher-generate-tarball.sh
index ba7e120..4370d2d 100755
--- a/indi-aagcloudwatcher-generate-tarball.sh
+++ b/indi-aagcloudwatcher-generate-tarball.sh
@@ -1,11 +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-aagcloudwatcher
-VERSION='1.2.0'
-REV=2675
+NAME="indi-aagcloudwatcher"
+ORIG=indi-$1
+NEW=$NAME-$1
 
-SVNURL='svn://svn.code.sf.net/p/indi/code/trunk/3rdparty/'$NAME
-svn export -r $REV $SVNURL $NAME-$VERSION.svn$REV
-
-tar -cJvf $NAME-$VERSION.svn$REV.tar.xz $NAME-$VERSION.svn$REV
-rm -rf $NAME-$VERSION.svn$REV
+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-aagcloudwatcher.spec b/indi-aagcloudwatcher.spec
index 9803d7d..935ca66 100644
--- a/indi-aagcloudwatcher.spec
+++ b/indi-aagcloudwatcher.spec
@@ -1,19 +1,17 @@
 %global driver aagcloudwatcher
-%global revision 2675
-%global date 20160202
-%global checkout %{date}svn%{revision}
-
 
 Name:           indi-%{driver}
-Version:        1.2.0
-# Post-Release checkout containing some improvements
-Release:        2.%{checkout}%{?dist}
+Version:        1.3.1
+Release:        1%{?dist}
 Summary:        INDI driver for the AAG Cloud Watcher
 
 License:        GPLv3+
 URL:            http://indilib.org/
-# Checkout from upstream svn
-Source0:        %{name}-%{version}.svn%{revision}.tar.xz
+# 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-aagcloudwatcher-generate-tarball.sh 1.3.1
+Source0:        %{name}-%{version}.tar.xz
 Source1:        %{name}-generate-tarball.sh
 
 BuildRequires:  cmake
@@ -45,6 +43,9 @@ make install DESTDIR=%{buildroot}
 %{_datadir}/indi/indi_%{driver}_sk.xml
 
 %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.2.0-2.20160202svn2675
 - Rebuild for libindi 1.2.0