diff --git a/.gitignore b/.gitignore
index be309c6..ed5f552 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@
 /libblockdev-2.6.tar.gz
 /libblockdev-2.7.tar.gz
 /libblockdev-2.8.tar.gz
+/libblockdev-2.9.tar.gz
diff --git a/libblockdev.spec b/libblockdev.spec
index ade7cb8..903efc8 100644
--- a/libblockdev.spec
+++ b/libblockdev.spec
@@ -13,6 +13,7 @@
 %define with_kbd 1
 %define with_part 1
 %define with_fs 1
+%define with_gi 1
 
 %define is_rhel 0%{?rhel} != 0
 
@@ -60,11 +61,14 @@
 %if %{with_fs} != 1
 %define fs_copts --without-fs
 %endif
+%if %{with_gi} != 1
+%define gi_copts --disable-introspection
+%endif
 
-%define configure_opts %{?distro_copts} %{?btrfs_copts} %{?crypto_copts} %{?dm_copts} %{?loop_copts} %{?lvm_copts} %{?lvm_dbus_copts} %{?mdraid_copts} %{?mpath_copts} %{?swap_copts} %{?kbd_copts} %{?part_copts} %{?fs_copts}
+%define configure_opts %{?distro_copts} %{?btrfs_copts} %{?crypto_copts} %{?dm_copts} %{?loop_copts} %{?lvm_copts} %{?lvm_dbus_copts} %{?mdraid_copts} %{?mpath_copts} %{?swap_copts} %{?kbd_copts} %{?part_copts} %{?fs_copts} %{?gi_copts}
 
 Name:        libblockdev
-Version:     2.8
+Version:     2.9
 Release:     1%{?dist}
 Summary:     A library for low-level manipulation with block devices
 License:     LGPLv2+
@@ -72,7 +76,9 @@ URL:         https://github.com/rhinstaller/libblockdev
 Source0:     https://github.com/rhinstaller/libblockdev/archive/%{name}-%{version}.tar.gz
 
 BuildRequires: glib2-devel
+%if %{with_gi}
 BuildRequires: gobject-introspection-devel
+%endif
 BuildRequires: python-devel
 %if %{with_python3}
 BuildRequires: python3-devel
@@ -602,7 +608,9 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm}
 %{!?_licensedir:%global license %%doc}
 %license LICENSE
 %{_libdir}/libblockdev.so.*
+%if %{with_gi}
 %{_libdir}/girepository*/BlockDev*.typelib
+%endif
 %config %{_sysconfdir}/libblockdev/conf.d/00-default.cfg
 
 %files devel
@@ -615,7 +623,9 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm}
 %if %{with_gtk_doc}
 %{_datadir}/gtk-doc/html/libblockdev
 %endif
+%if %{with_gi}
 %{_datadir}/gir*/BlockDev*.gir
+%endif
 
 %files -n python2-blockdev
 %{python2_sitearch}/gi/overrides/*
@@ -787,6 +797,19 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm}
 %files plugins-all
 
 %changelog
+* Tue Jun 13 2017 Vratislav Podzimek <vpodzime@redhat.com> - 2.9-1
+- Fix hardcoded reference to gcc (timo.gurr)
+- Catch and ignore partial failures in LVM tests' cleanups (vpodzime)
+- Fix hardcoded reference to pkg-config (timo.gurr)
+- Make GObject introspection optional (vpodzime)
+- Do not link libraries required by plugins to the GI files (vpodzime)
+- Make sure the whole build status image is shown (vpodzime)
+- Show CI status in README (at the GH repo's front page) (vpodzime)
+- Always require the libudev pkg (tgurr)
+- Make sure we give kernel time to fully setup zram device(s) (vpodzime)
+- fs_test.py: Close FDs when calling utilities (tasleson)
+- crypto.c: Correct segmentation fault (tasleson)
+
 * Tue Jun 06 2017 Vratislav Podzimek <vpodzime@redhat.com> - 2.8-1
 - Temporarily skip vfat generic resize test on rawhide (vtrefny)
 - Use "safeprobe" in "bd_fs_wipe" (vtrefny)
diff --git a/sources b/sources
index 001be79..a3102d2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libblockdev-2.8.tar.gz) = 77a90439d8a3d19f021b8c1ae0af9085e3ab026046197d82fd0c9f0ef1d5cd80510676583c21ff7fc8aa01c749926cb37e91eb85a1c152abe247330a24080b83
+SHA512 (libblockdev-2.9.tar.gz) = 37b1ead0b6683a4eeb6278e99de1577e7d4d382863c6f1cc5d8cfbd2a250284178ef0cd587d278c02b33c298487a7b020288b48d6a5ed18e61ce07577ab73b96