diff --git a/i18n_taxonomy/i18n_taxonomy.info b/i18n_taxonomy/i18n_taxonomy.info
index e0a68d1..91fccd5 100644
--- a/i18n_taxonomy/i18n_taxonomy.info
+++ b/i18n_taxonomy/i18n_taxonomy.info
@@ -10,3 +10,6 @@ files[] = i18n_taxonomy.inc
 files[] = i18n_taxonomy.pages.inc
 files[] = i18n_taxonomy.admin.inc
 files[] = i18n_taxonomy.test
+
+;Views integration
+files[] = views/i18n_taxonomy_handler_filter_language.inc
diff --git a/i18n_taxonomy/i18n_taxonomy.module b/i18n_taxonomy/i18n_taxonomy.module
index 9ea630b..5538264 100644
--- a/i18n_taxonomy/i18n_taxonomy.module
+++ b/i18n_taxonomy/i18n_taxonomy.module
@@ -129,6 +129,16 @@ function i18n_taxonomy_admin_paths() {
 }
 
 /**
+ * Implements hook_views_api().
+ */
+function i18n_taxonomy_views_api() {
+  return array(
+    'api' => 2,
+    'path' => drupal_get_path('module', 'i18n_taxonomy') . '/views',
+  );
+}
+
+/**
  * Implements hook_menu_alter().
  *
  * Take over the taxonomy pages
diff --git a/i18n_taxonomy/views/i18n_taxonomy.views.inc b/i18n_taxonomy/views/i18n_taxonomy.views.inc
new file mode 100755
index 0000000..428f3ac
--- /dev/null
+++ b/i18n_taxonomy/views/i18n_taxonomy.views.inc
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * @file
+ *
+ * Provide views data and handlers for i18n_taxonomy.module
+ */
+
+/**
+ * @defgroup views_translation_module translation.module handlers
+ *
+ * @{
+ */
+
+/**
+ * Implements hook_views_data().
+ *
+ * Add translation information to the taxonomy term data table.
+ */
+function i18n_taxonomy_views_data() {
+  // Language field.
+  $data['taxonomy_term_data']['language'] = array(
+    'group' => t('Taxonomy translation'),
+    'title' => t('Language'),
+    'help' => t('The language the taxonomy term is in.'),
+    'filter' => array(
+      'handler' => 'i18n_taxonomy_handler_filter_language',
+    ),
+  );
+  return $data;
+}
+
+/**
+ * @}
+ */
diff --git a/i18n_taxonomy/views/i18n_taxonomy_handler_filter_language.inc b/i18n_taxonomy/views/i18n_taxonomy_handler_filter_language.inc
new file mode 100755
index 0000000..c54113d
--- /dev/null
+++ b/i18n_taxonomy/views/i18n_taxonomy_handler_filter_language.inc
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Filter by language
+ */
+class i18n_taxonomy_handler_filter_language extends views_handler_filter_in_operator {
+  function get_value_options() {
+    if (!isset($this->value_options)) {
+      $this->value_title = t('Language');
+      $languages = array(
+        '***CURRENT_LANGUAGE***' => t("Current user's language"),
+        '***DEFAULT_LANGUAGE***' => t("Default site language"),
+        LANGUAGE_NONE => t('No language')
+      );
+      $languages = array_merge($languages, locale_language_list());
+      $this->value_options = $languages;
+    }
+  }
+}