diff --git a/ChangeLog b/ChangeLog
index 488b1f5e5..a995da168 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-19  Sergey Udaltsov <svu@gnome.org>
+
+	* configure.in: Introduced dependency on iso-codes
+
 2008-04-19  Jens Granseuer  <jensgr@gmx.net>
 
 	* configure.in: figure out where GTK+ expects its theme engines and
diff --git a/configure.in b/configure.in
index 53eed00f4..0e8fe7ce8 100644
--- a/configure.in
+++ b/configure.in
@@ -416,6 +416,21 @@ AC_ARG_ENABLE(update-mimedb,
                    enable_update_mimedb=yes)
 AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes)
 
+dnl -----------------------------------------------------------
+dnl ISO codes
+dnl -----------------------------------------------------------
+AC_MSG_CHECKING([whether iso-codes exists])
+if $PKG_CONFIG iso-codes > /dev/null ; then
+   AC_MSG_RESULT([yes])
+   iso_codes_prefix=`$PKG_CONFIG --variable=prefix iso-codes`
+   iso_codes_pkgconfig=iso-codes
+   have_iso_codes=yes
+else
+   AC_MSG_RESULT([no])
+   AC_MSG_ERROR([You must have iso-codes.])
+fi
+
+AC_DEFINE_UNQUOTED([ISO_CODES_PREFIX],["$iso_codes_prefix"],[ISO codes prefix])
 
 AC_CONFIG_FILES([
 Makefile