diff --git a/rules/modules/taxonomy.rules.inc b/rules/modules/taxonomy.rules.inc
index 4c2dd28..f707698 100644
--- a/rules/modules/taxonomy.rules.inc
+++ b/rules/modules/taxonomy.rules.inc
@@ -56,6 +56,30 @@ function rules_events_argument_taxonomy_term_unchanged($taxonomy_term) {
 }
 
 /**
+ * Implementation of hook_rules_condition_info().
+ */
+function taxonomy_rules_condition_info() {
+  return array(
+    'rules_condition_taxonomy_term_in_vocabulary' => array(
+      'label' => t('Term in vocabulary'),
+      'arguments' => array(
+        'term' => array('type' => 'taxonomy_term', 'label' => t('Term')),
+      ),
+      'module' => 'Taxonomy',
+      'help' => t('Evaluates to TRUE if the taxonomy term is in any of the configured vocabularies.'),
+      'module' => 'Taxonomy',
+    ),
+  );
+}
+
+/**
+ * Condition: Check for selected content types
+ */
+function rules_condition_taxonomy_term_in_vocabulary(&$term, $settings) {
+  return in_array($term->vid, $settings['vocab']);
+}
+
+/**
  * Implementation of hook_rules_action_info().
  */
 function taxonomy_rules_action_info() {
diff --git a/rules/modules/taxonomy.rules_forms.inc b/rules/modules/taxonomy.rules_forms.inc
index 8435ed9..20b7025 100644
--- a/rules/modules/taxonomy.rules_forms.inc
+++ b/rules/modules/taxonomy.rules_forms.inc
@@ -8,6 +8,29 @@
  * @{
  */
 
+
+/**
+ * Condition: Check for vocabularies - Configuration form
+ */
+function rules_condition_taxonomy_term_in_vocabulary_form($settings, &$form) {
+  $form['settings']['vocab'] = array(
+    '#type' => 'select',
+    '#title' => t('Vocabularies'),
+    '#options' => _rules_action_taxonomy_get_vocab(),
+    '#multiple' => TRUE,
+    '#default_value' => isset($settings['vocab']) ? $settings['vocab'] : array(),
+    '#required' => TRUE,
+  );
+}
+
+/**
+ * Label callback for the taxonomy term in vocabulary condition
+ */
+function rules_condition_taxonomy_term_in_vocabulary_label($settings, $argument_labels) {
+  $names = array_intersect_key(_rules_action_taxonomy_get_vocab(), $settings['vocab']);
+  return t('@term in @vocabulary', $argument_labels + array('@vocabulary' => implode(' '. t('or') .' ', $names)));
+}
+
 /**
  * Action: Load a term configuration form.
  *