diff --git a/configure.in b/configure.in
index 0c7078d..47ebc2e 100644
--- a/configure.in
+++ b/configure.in
@@ -211,6 +211,11 @@ PKG_CHECK_MODULES(BRASERO_SM, sm)
 AC_SUBST(BRASERO_SM_CFLAGS)
 AC_SUBST(BRASERO_SM_LIBS)
 
+PKG_CHECK_MODULES(LIBKIBI, libkibi)
+
+AC_SUBST(LIBKIBI_CFLAGS)
+AC_SUBST(LIBKIBI_LIBS)
+
 #
 # GTK+ stuff (taken and adapted from empathy)
 #
@@ -352,6 +357,20 @@ else
 fi
 AM_CONDITIONAL(BUILD_CDRKIT, test x"$build_cdrkit" = "xyes")
 
+dnl ************* check for libkibi *********************
+AM_CONDITIONAL(HAVE_LIBKIBI, false)
+
+AC_ARG_ENABLE(libkibi,
+			AC_HELP_STRING([--disable-libkibi],[build without libkibi support]),
+			[with_libkibi=$enableval],
+			[with_libkibi="yes"])
+
+if test x"$with_libkibi" = "xyes"; then
+	AC_DEFINE(HAVE_LIBKIBI, 1, [Define to enable libkibi support])
+else
+	with_libkibi="no"
+fi
+
 dnl **************** check for growisofs ************************
 AC_ARG_ENABLE(growisofs,
 			AS_HELP_STRING([--enable-growisofs],[Build growisofs plugins [[default=yes]]]),
diff --git a/libbrasero-burn/Makefile.am b/libbrasero-burn/Makefile.am
index 7be80e6..3f72dab 100644
--- a/libbrasero-burn/Makefile.am
+++ b/libbrasero-burn/Makefile.am
@@ -18,7 +18,8 @@ INCLUDES = \
 	$(BRASERO_GIO_CFLAGS)						\
 	$(BRASERO_GTK_CFLAGS)						\
 	$(BRASERO_GSTREAMER_CFLAGS)					\
-	$(BRASERO_CANBERRA_CFLAGS)
+	$(BRASERO_CANBERRA_CFLAGS)					\
+	$(LIBKIBI_CFLAGS)
 
 GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
 RECMARSHALFILES = libbrasero-marshal.h libbrasero-marshal.c
@@ -65,7 +66,8 @@ libbrasero_burn@BRASERO_LIBRARY_SUFFIX@_la_LIBADD =					\
 	$(BRASERO_GIO_LIBS)					\
 	$(BRASERO_GTK_LIBS)					\
 	$(BRASERO_GSTREAMER_LIBS)				\
-	$(BRASERO_CANBERRA_LIBS)
+	$(BRASERO_CANBERRA_LIBS)				\
+	$(LIBKIBI_CFLAGS)
 
 libbrasero_burn@BRASERO_LIBRARY_SUFFIX@_la_LDFLAGS =					\
 	-version-info $(LIBBRASERO_LT_VERSION)			\
diff --git a/libbrasero-burn/brasero-dest-selection.c b/libbrasero-burn/brasero-dest-selection.c
index 68739db..c786b3f 100644
--- a/libbrasero-burn/brasero-dest-selection.c
+++ b/libbrasero-burn/brasero-dest-selection.c
@@ -40,6 +40,10 @@
 
 #include <gtk/gtk.h>
 
+#if HAVE_LIBKIBI
+#  include <kibi.h>
+#endif
+
 #include "burn-basics.h"
 #include "burn-plugin-manager.h"
 #include "brasero-medium-selection-priv.h"
diff --git a/libbrasero-burn/brasero-drive-properties.c b/libbrasero-burn/brasero-drive-properties.c
index 79f50d4..1fe2ce2 100644
--- a/libbrasero-burn/brasero-drive-properties.c
+++ b/libbrasero-burn/brasero-drive-properties.c
@@ -42,6 +42,10 @@
 
 #include <gtk/gtk.h>
 
+#if HAVE_LIBKIBI
+#  include <kibi.h>
+#endif
+
 #include "brasero-medium.h"
 #include "brasero-drive.h"
 
diff --git a/libbrasero-burn/brasero-medium-properties.c b/libbrasero-burn/brasero-medium-properties.c
index 6dfae3e..3bccf31 100644
--- a/libbrasero-burn/brasero-medium-properties.c
+++ b/libbrasero-burn/brasero-medium-properties.c
@@ -40,6 +40,10 @@
 
 #include <gtk/gtk.h>
 
+#if HAVE_LIBKIBI
+#  include <kibi.h>
+#endif
+
 #include "brasero-medium-properties.h"
 #include "brasero-drive-properties.h"
 #include "brasero-image-properties.h"
diff --git a/libbrasero-burn/brasero-progress.c b/libbrasero-burn/brasero-progress.c
index 1027fe3..599494a 100644
--- a/libbrasero-burn/brasero-progress.c
+++ b/libbrasero-burn/brasero-progress.c
@@ -40,6 +40,10 @@
 
 #include <gtk/gtk.h>
 
+#if HAVE_LIBKIBI
+#  include <kibi.h>
+#endif
+
 #include "brasero-progress.h"
 #include "burn-basics.h"
 #include "brasero-medium.h"
diff --git a/libbrasero-burn/brasero-src-image.c b/libbrasero-burn/brasero-src-image.c
index 27be531..51c6fe6 100644
--- a/libbrasero-burn/brasero-src-image.c
+++ b/libbrasero-burn/brasero-src-image.c
@@ -40,6 +40,10 @@
 
 #include <gtk/gtk.h>
 
+#if HAVE_LIBKIBI
+#  include <kibi.h>
+#endif
+
 #include "burn-basics.h"
 
 #include "brasero-drive.h"
diff --git a/libbrasero-burn/brasero-status-dialog.c b/libbrasero-burn/brasero-status-dialog.c
index 3196220..33ee944 100644
--- a/libbrasero-burn/brasero-status-dialog.c
+++ b/libbrasero-burn/brasero-status-dialog.c
@@ -38,6 +38,10 @@
 
 #include <gtk/gtk.h>
 
+#if HAVE_LIBKIBI
+#  include <kibi.h>
+#endif
+
 #include "brasero-misc.h"
 
 #include "brasero-units.h"
diff --git a/libbrasero-burn/brasero-track-data-cfg.c b/libbrasero-burn/brasero-track-data-cfg.c
index cad5dbb..671d780 100644
--- a/libbrasero-burn/brasero-track-data-cfg.c
+++ b/libbrasero-burn/brasero-track-data-cfg.c
@@ -40,6 +40,10 @@
 
 #include <gtk/gtk.h>
 
+#if HAVE_LIBKIBI
+#  include <kibi.h>
+#endif
+
 #include "brasero-units.h"
 #include "brasero-volume.h"
 
diff --git a/libbrasero-media/brasero-medium-selection.c b/libbrasero-media/brasero-medium-selection.c
index 4ced00c..5393099 100644
--- a/libbrasero-media/brasero-medium-selection.c
+++ b/libbrasero-media/brasero-medium-selection.c
@@ -38,6 +38,10 @@
 
 #include <gtk/gtk.h>
 
+#if HAVE_LIBKIBI
+#  include <kibi.h>
+#endif
+
 #include "brasero-medium-selection.h"
 #include "brasero-medium-selection-priv.h"
 #include "brasero-medium.h"
diff --git a/src/Makefile.am b/src/Makefile.am
index 7f91e6a..feeb5e1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,7 +23,8 @@ INCLUDES = \
 	$(BRASERO_LIBXML_CFLAGS)					\
 	$(BRASERO_SEARCH_CFLAGS)					\
 	$(BRASERO_PL_PARSER_CFLAGS)					\
-	$(BRASERO_SM_CFLAGS)
+	$(BRASERO_SM_CFLAGS)						\
+	$(LIBKIBI_CFLAGS)
 
 GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
 RECMARSHALFILES = brasero-marshal.h brasero-marshal.c
@@ -169,7 +170,8 @@ brasero_LDADD =						\
 	$(BRASERO_LIBXML_LIBS)		\
 	$(BRASERO_SEARCH_LIBS)		\
 	$(BRASERO_PL_PARSER_LIBS)	\
-	$(BRASERO_SM_LIBS)
+	$(BRASERO_SM_LIBS)	\
+	$(LIBKIBI_LIBS)
 
 EXTRA_DIST =			\
 	brasero-marshal.list
diff --git a/src/brasero-project-manager.c b/src/brasero-project-manager.c
index deb9f24..ff78262 100644
--- a/src/brasero-project-manager.c
+++ b/src/brasero-project-manager.c
@@ -38,6 +38,10 @@
 
 #include <gtk/gtk.h>
 
+#if HAVE_LIBKIBI
+#  include <kibi.h>
+#endif
+
 #include "brasero-io.h"
 
 #include "brasero-units.h"
diff --git a/src/brasero-project.c b/src/brasero-project.c
index 0a3cbda..2327be3 100644
--- a/src/brasero-project.c
+++ b/src/brasero-project.c
@@ -43,6 +43,10 @@
 
 #include <gst/gst.h>
 
+#if HAVE_LIBKIBI
+#  include <kibi.h>
+#endif
+
 #include "brasero-units.h"
 
 #include "brasero-misc.h"
