diff --git a/.gitignore b/.gitignore
index e8a15f2..a0e6eab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,4 @@ libindi0_0.6.tar.gz
 /indi-1.9.7.tar.gz
 /indi-1.9.8.tar.gz
 /indi-1.9.9.tar.gz
+/indi-2.0.0.tar.gz
diff --git a/libindi.spec b/libindi.spec
index 0f99e89..958f4d3 100644
--- a/libindi.spec
+++ b/libindi.spec
@@ -2,21 +2,20 @@
 # building QT5 client
 %global build_qt5_client 1
 
+# Define boolean to quickly set option and dependencies for
+# building with websocket support
+%global build_websocket 1
+
 # Define boolean to quickly set option and dependencies for
 # unit tests
-# s390x test fail https://github.com/indilib/indi/issues/1359
-%ifarch s390x
-%global build_tests 0
-%else
 %global build_tests 1
-%endif
 
 Name:       libindi
-Version:    1.9.9
+Version:    2.0.0
 Release:    %autorelease
 Summary:    Instrument Neutral Distributed Interface
 
-License:    LGPLv2+ and GPLv2+
+License:    GPL-2.0-or-later AND LGPL-2.1-or-later AND LGPL-2.0-or-later and BSD-3-Clause
 # See COPYRIGHT file for a description of the licenses and files covered
 
 URL:        http://www.indilib.org
@@ -48,6 +47,14 @@ BuildRequires: pkgconfig(Qt5Network)
 %global qt5_client OFF
 %endif
 
+%if 0%{?build_websocket}
+BuildRequires: boost-devel
+BuildRequires: websocketpp-devel
+%global websocket ON
+%else
+%global websocket OFF
+%endif
+
 %if 0%{?build_tests}
 BuildRequires: pkgconfig(gtest)
 BuildRequires: pkgconfig(gmock)
@@ -99,7 +106,8 @@ chmod -x drivers/telescope/pmc8driver.cpp
 %build
 %cmake \
     -DINDI_BUILD_QT5_CLIENT="%{qt5_client}" \
-    -DINDI_BUILD_UNITTESTS="%{tests}"
+    -DINDI_BUILD_UNITTESTS="%{tests}" \
+    -DINDI_BUILD_WEBSOCKET="%{websocket}"
 
 %cmake_build
 
@@ -109,29 +117,34 @@ chmod -x drivers/telescope/pmc8driver.cpp
 
 %check
 %if 0%{?build_tests}
-%ctest --test-dir test
+%ctest --test-dir %_vpath_builddir/test
 %endif
 
 
 %files
 %license COPYING.BSD COPYING.GPL COPYING.LGPL COPYRIGHT LICENSE
 %doc AUTHORS ChangeLog NEWS README
-%{_bindir}/*
+%{_bindir}/indi_*
+%{_bindir}/indiserver
+%{_bindir}/shelyak_usis
 %{_datadir}/indi
-%{_udevrulesdir}/*.rules
+%{_udevrulesdir}/80-dbk21-camera.rules
+%{_udevrulesdir}/99-indi_auxiliary.rules
 
 %files libs
 %license COPYING.BSD COPYING.GPL COPYING.LGPL COPYRIGHT LICENSE
-%{_libdir}/*.so.*
+%{_libdir}/%{name}*.so.2
+%{_libdir}/%{name}*.so.2.*
 %{_libdir}/indi/MathPlugins
 
 %files devel
-%{_includedir}/*
-%{_libdir}/*.so
-%{_libdir}/pkgconfig/*.pc
+%{_includedir}/%{name}
+%{_libdir}/%{name}*.so
+%{_libdir}/pkgconfig/%{name}.pc
 
 %files static
-%{_libdir}/*.a
+%{_libdir}/%{name}*.a
+
 
 %changelog
 %autochangelog
diff --git a/sources b/sources
index 05e4e67..d736b43 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (indi-1.9.9.tar.gz) = 1684b70fb2cb796be315ac3cb46b18efca1e76803f508e2b435416cadc9b8930acc0333b01d97352a429296ac9abdf0d54cd8ed21171aa47315148a48a9bede6
+SHA512 (indi-2.0.0.tar.gz) = 433bd01999f60ef8164e85e663478b106cb4e5ceaeaa9482c9e07a59d0d0faadd89ebe0076960bf51c04171c141c2b561f8795e6aa90af8b57403be9c036ddcf