diff --git a/sites/all/modules/context/context.core.inc b/sites/all/modules/context/context.core.inc
index 62b1a25..5f5cd2e 100644
--- a/sites/all/modules/context/context.core.inc
+++ b/sites/all/modules/context/context.core.inc
@@ -170,6 +170,14 @@ function context_node_condition(&$node, $op) {
       $plugin->execute($node, $op);
     }
   }
+  if (module_exists('content')) {
+    $content_type = content_types($node->type);
+    foreach ($content_type['fields'] as $field) {
+      if ($plugin = context_get_plugin('condition', $field['field_name'])) {
+        $plugin->execute($node, $op);
+      }
+    }
+  }
   if (module_exists('book')) {
     if ($plugin = context_get_plugin('condition', 'book')) {
       $plugin->execute($node, $op);
diff --git a/sites/all/modules/context/context.install b/sites/all/modules/context/context.install
index 8811c75..8aa8816 100644
--- a/sites/all/modules/context/context.install
+++ b/sites/all/modules/context/context.install
@@ -309,6 +309,14 @@ function context_migrate_api_3(&$ret, $contexts) {
         'views' => 'views',
         'nodequeue' => 'nodequeue'
       );
+      if (module_exists('content')) {
+        foreach (content_fields() as $field) {
+          $values = content_allowed_values($field);
+          if (!empty($values)) {
+            $conditions[$field['field_name']] = $field['field_name'];
+          }
+        }
+      }
       foreach ($conditions as $old_key => $new_key) {
         if (isset($context->{$old_key})) {
           $values = $context->{$old_key};
diff --git a/sites/all/modules/context/context.plugins.inc b/sites/all/modules/context/context.plugins.inc
index 5089681..ccd1d75 100644
--- a/sites/all/modules/context/context.plugins.inc
+++ b/sites/all/modules/context/context.plugins.inc
@@ -62,6 +62,18 @@ function _context_context_registry() {
       'plugin' => 'context_condition_bookroot',
     );
   }
+  if (module_exists('content')) {
+    foreach (content_fields() as $field) {
+      $values = content_allowed_values($field);
+      if (!empty($values)) {
+        $registry['conditions'][$field['field_name']] = array(
+          'title' => t('Content: @field', array('@field' => $field['widget']['label'])),
+          'description' => t('Set this context when viewing a node with the selected value for the %label field', array('%label' => $field['field_name'])),
+          'plugin' => 'context_condition_content',
+        );
+      }
+    }
+  }
   if (module_exists('locale')) {
     $registry['conditions']['language'] = array(
       'title' => t('Language'),
@@ -205,6 +217,16 @@ function _context_context_plugins() {
       ),
     );
   }
+  if (module_exists('content')) {
+    $plugins['context_condition_content'] = array(
+      'handler' => array(
+        'path' => drupal_get_path('module', 'context') .'/plugins',
+        'file' => 'context_condition_content.inc',
+        'class' => 'context_condition_content',
+        'parent' => 'context_condition_node',
+      ),
+    );
+  }
   if (module_exists('book')) {
     $plugins['context_condition_book'] = array(
       'handler' => array(