diff --git a/baselibs.conf b/baselibs.conf
new file mode 100644
index 0000000..d28a4df
--- /dev/null
+++ b/baselibs.conf
@@ -0,0 +1 @@
+libgeis1
diff --git a/geis-2.2.16.tar.xz b/geis-2.2.16.tar.xz
deleted file mode 100644
index d61bab7..0000000
--- a/geis-2.2.16.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:40a694092c79f325a2fbf8a9f301177bc91c364f4e637c2aa8963ad2a5aabbcf
-size 449092
diff --git a/geis-2.2.17.tar.xz b/geis-2.2.17.tar.xz
new file mode 100644
index 0000000..64995dc
--- /dev/null
+++ b/geis-2.2.17.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8a60f5683852094038904e690d23cc5a90a980fc52da67f0f28890baa25c70eb
+size 457156
diff --git a/geis.changes b/geis.changes
index 35cdea3..ec338d2 100644
--- a/geis.changes
+++ b/geis.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sat Aug 29 21:16:37 UTC 2015 - sor.alexei@meowr.ru
+
+- Update to 2.2.17.
+- Rename geis package to geis-tools.
+- Add baselibs.conf.
+- Spec cleanup.
+
 -------------------------------------------------------------------
 Mon Dec 22 19:48:04 UTC 2014 - tchvatal@suse.com
 
@@ -23,4 +31,3 @@ Fri Aug 10 01:14:56 UTC 2012 - nmo.marques@gmail.com
 Thu Aug  9 17:02:36 UTC 2012 - nmo.marques@gmail.com
 
 - initial package
-
diff --git a/geis.spec b/geis.spec
index f3bf521..5ee3f20 100644
--- a/geis.spec
+++ b/geis.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package geis
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,45 +16,56 @@
 #
 
 
-%define _name   libgeis1
+%define soname  libgeis
+%define sover   1
 Name:           geis
-Version:        2.2.16
+Version:        2.2.17
 Release:        0
 Summary:        Gesture engine interface and support
-License:        GPL-2.0 and GPL-3.0
+License:        LGPL-3.0 and GPL-3.0
 Group:          System/GUI/Other
-Url:            http://launchpad.net/geis
+Url:            https://launchpad.net/geis
 Source:         https://launchpad.net/%{name}/trunk/%{version}/+download/%{name}-%{version}.tar.xz
+Source1:        baselibs.conf
+BuildRequires:  autoconf
+BuildRequires:  automake
 BuildRequires:  fdupes
-BuildRequires:  python3-xml
+BuildRequires:  libtool
 BuildRequires:  update-desktop-files
-BuildRequires:  pkgconfig(dbus-1)
-BuildRequires:  pkgconfig(evemu)
-BuildRequires:  pkgconfig(frame)
-BuildRequires:  pkgconfig(grail)
-BuildRequires:  pkgconfig(inputproto)
-BuildRequires:  pkgconfig(mtdev)
-BuildRequires:  pkgconfig(python)
-BuildRequires:  pkgconfig(python3)
+BuildRequires:  pkg-config
+BuildRequires:  pkgconfig(dbus-1) >= 1.2.16
+BuildRequires:  pkgconfig(frame) >= 2.2
+BuildRequires:  pkgconfig(grail) >= 3.0.8
+BuildRequires:  pkgconfig(python3) >= 3.2
 BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(xcb) >= 1.6
 BuildRequires:  pkgconfig(xext)
-BuildRequires:  pkgconfig(xi)
+BuildRequires:  pkgconfig(xi) >= 1.3
 BuildRequires:  pkgconfig(xorg-server)
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
-GEIS is a library for applications and toolkit programmers which provides a
-consistent platform independent interface for any system-wide input gesture
-recognition mechanism.
+GEIS is a library for applications and toolkit programmers which
+provides a consistent platform independent interface for any
+system-wide input gesture recognition mechanism.
 
-%package -n %{_name}
+%package -n %{soname}%{sover}
 Summary:        Gesture engine interface and support
 Group:          System/Libraries
 
-%description -n %{_name}
-GEIS is a library for applications and toolkit programmers which provides a
-consistent platform independent interface for any system-wide input gesture
-recognition mechanism.
+%description -n %{soname}%{sover}
+GEIS is a library for applications and toolkit programmers which
+provides a consistent platform independent interface for any
+system-wide input gesture recognition mechanism.
+
+%package tools
+Summary:        Gesture engine interface and support
+Group:          System/GUI/Other
+Requires:       python3-geis = %{version}
+
+%description tools
+GEIS is a library for applications and toolkit programmers which
+provides a consistent platform independent interface for any
+system-wide input gesture recognition mechanism.
 
 %package -n python3-geis
 Summary:        Python3 bindings for GEIS
@@ -66,66 +77,62 @@ This package provides the python3 bindings for GEIS.
 %package devel
 Summary:        Development files for the GEIS interface implementation
 Group:          Development/Libraries/Other
-Requires:       %{_name} = %{version}
-Requires:       %{name} = %{version}
-Requires:       python3-geis = %{version}
+Requires:       %{soname}%{sover} = %{version}
 
 %description devel
-GEIS is a library for applications and toolkit programmers which provides a
-consistent platform independent interface for any system-wide input gesture
-recognition mechanism.
+GEIS is a library for applications and toolkit programmers which
+provides a consistent platform independent interface for any
+system-wide input gesture recognition mechanism.
 
 %prep
 %setup -q
 
 %build
+autoreconf -fi
 %configure \
-    --disable-static \
-    --disable-silent-rules \
-    --with-evemu
+  --disable-static                  \
+  --disable-silent-rules            \
+  --docdir=%{_docdir}/%{name}-devel/
 make %{?_smp_mflags}
 
 %install
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
+%make_install
 find %{buildroot} -type f -name "*.la" -delete -print
+
 %suse_update_desktop_file -G "Geis Viewer" geisview Utility DesktopSettings
+chmod a+x %{buildroot}%{python3_sitelib}/geisview/__init__.py
 %fdupes %{buildroot}%{python3_sitelib}
-# python-geis.x86_64: W: non-executable-script
-if [ ! -x %{buildroot}%{python3_sitelib}/geisview/__init__.py ]; then
-   chmod 0755 %{buildroot}%{python3_sitelib}/geisview/__init__.py
-fi
 
-%post -n %{_name} -p /sbin/ldconfig
+%post -n %{soname}%{sover} -p /sbin/ldconfig
 
-%postun -n %{_name} -p /sbin/ldconfig
+%postun -n %{soname}%{sover} -p /sbin/ldconfig
 
-%files
+%files tools
 %defattr(-,root,root)
-%doc ChangeLog README COPYING
+%doc AUTHORS COPYING COPYING.GPL README
 %{_bindir}/geistest
 %{_bindir}/geisview
-%{_bindir}/geis-server
+%{_bindir}/pygeis
+%{_datadir}/geisview/
 %{_datadir}/applications/geisview.desktop
-%{_datadir}/pixmaps/geisview32x32.xpm
-%{_mandir}/man1/*
+%{_datadir}/pixmaps/geisview*.xpm
+%{_mandir}/man1/*geis*.1%{?ext_man}
+
+%files -n %{soname}%{sover}
+%defattr(-,root,root)
+%doc AUTHORS COPYING COPYING.GPL README
+%{_libdir}/libgeis.so.%{sover}*
 
 %files -n python3-geis
 %defattr(-,root,root)
-%{_bindir}/pygeis
-%{python3_sitelib}/
-%{python3_sitearch}/
-%{_datadir}/geisview/
-
-%files -n %{_name}
-%defattr(-,root,root)
-%doc ChangeLog README COPYING
-%{_libdir}/*.so.*
+%{python3_sitelib}/geis*/
+%{python3_sitearch}/*.so
 
 %files devel
 %defattr(-,root,root)
+%doc %{_docdir}/%{name}-devel/
 %{_includedir}/geis/
-%{_libdir}/*.so
-%{_libdir}/pkgconfig/*.pc
-%{_datadir}/doc/geis/
+%{_libdir}/libgeis.so
+%{_libdir}/pkgconfig/libgeis.pc
 
 %changelog