diff --git a/og_titles.install b/og_titles.install
index c7c68ac..55f75cb 100644
--- a/og_titles.install
+++ b/og_titles.install
@@ -40,7 +40,10 @@ function og_titles_schema() {
       'title' => array( 'type' => 'varchar', 'length' => '255', 'not null' => FALSE, 'description' => t('Arbitrary custom title or rank.') ),
       'weight' => array( 'type' => 'int', 'size' => 'normal', 'not null' => TRUE, 'description' => t('Weight of the title'), 'default' => '0'),
     ),
-    'primary key' => array('nid','tlid'),
+    'primary key' => array('tlid'),
+    'indexes' => array(
+      'nid' => array('nid', 'tlid'),
+    ),
   );
 
   return $schema;
@@ -116,3 +119,14 @@ function og_titles_update_6006() {
 
   return $ret;
 }
+
+// Fix InnoDB support
+function og_titles_update_6007() {
+  $ret = array();
+
+  db_drop_primary_key($ret, 'og_titles');
+  db_add_primary_key($ret, 'og_titles', array('tlid'));
+  db_add_index($ret, 'og_titles', 'nid', array('nid', 'tlid'));
+
+  return $ret;
+}