diff --git a/.cvsignore b/.cvsignore
index fdd0e10..57adb3b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-inotify-tools-2.6.tar.gz
+inotify-tools-3.6.tar.gz
diff --git a/inotify-tools.spec b/inotify-tools.spec
index d8db8d6..6cadc62 100644
--- a/inotify-tools.spec
+++ b/inotify-tools.spec
@@ -1,5 +1,5 @@
 Name:           inotify-tools
-Version:        2.6
+Version:        3.6
 Release:        1%{?dist}
 Summary:        Command line utilities for inotify
 
@@ -9,19 +9,31 @@ URL:            http://inotify-tools.sourceforge.net/
 Source0:        http://download.sf.net/inotify-tools/inotify-tools-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  autoconf
+BuildRequires:  doxygen
 
 %description
 inotify-tools is a set of command-line programs for Linux providing
 a simple interface to inotify. These programs can be used to monitor
 and act upon filesystem events.
 
+%package        devel
+Summary:        Headers and libraries for building apps that use libinotifytools
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description    devel
+This package contains headers and libraries required to build applications
+that use the libinotifytools library.
 
 %prep
 %setup -q
 
 
 %build
-%configure --disable-dependency-tracking
+%configure \
+        --disable-dependency-tracking \
+        --disable-static
 make %{?_smp_mflags}
 
 
@@ -29,21 +41,55 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
+find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
+# We'll install documentation in the proper place
+rm -rf %{buildroot}/%{_datadir}/doc/
+
+
+%check
+make check
+
 
 %clean
 rm -rf %{buildroot}
 
 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_bindir}/inotifywait
 %{_bindir}/inotifywatch
+%{_libdir}/libinotifytools.so.*
 %{_mandir}/man1/inotifywait.1*
 %{_mandir}/man1/inotifywatch.1*
 
+%files devel
+%defattr(-,root,root,-)
+%doc libinotifytools/src/doc/html/*
+%dir %{_includedir}/inotifytools/
+%{_includedir}/inotifytools/inotify.h
+%{_includedir}/inotifytools/inotify-nosys.h
+%{_includedir}/inotifytools/inotifytools.h
+%{_libdir}/libinotifytools.so
+
 
 %changelog
+* Sun Dec 17 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 3.6-1
+- Update to 3.6
+
+* Tue Oct 31 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 3.3-1
+- Update to 3.3
+- Add %%check stage
+
+* Sat Oct 28 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 3.1-1
+- Update to 3.1
+- Add -devel subpackage
+
 * Tue Oct  3 2006 Dawid Gajownik <gajownik[AT]gmail.com> - 2.6-1
 - Update to 2.6
 
diff --git a/sources b/sources
index f694546..596f17d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4e3f876c4bac9d3cb520d81810832906  inotify-tools-2.6.tar.gz
+5ca0a0c64fbf406dc8bfff3f1d5d4cf4  inotify-tools-3.6.tar.gz