diff --git a/apachesolr.install b/apachesolr.install
index cac920d..a6f0e50 100644
--- a/apachesolr.install
+++ b/apachesolr.install
@@ -150,6 +150,8 @@ function apachesolr_uninstall() {
   variable_del('apachesolr_cron_limit');
   variable_del('apachesolr_enabled_facets');
   variable_del('apachesolr_exclude_nodeapi_types');
+  variable_del('apachesolr_failure');
+  variable_del('apachesolr_read_only');
   // Remove tables.
   drupal_uninstall_schema('apachesolr');
   // Remove blocks.
diff --git a/apachesolr_search.install b/apachesolr_search.install
index b278ff3..5704009 100644
--- a/apachesolr_search.install
+++ b/apachesolr_search.install
@@ -10,6 +10,12 @@
  * Update to namespace tracking.
  */
 function apachesolr_search_uninstall() {
+  variable_del('apachesolr_search_default_previous');
+  variable_del('apachesolr_search_spellcheck');
+  variable_del('apachesolr_search_taxonomy_links');
+  variable_del('apachesolr_search_taxonomy_previous');
+  variable_del('apachesolr_set_nodeapi_messages');
+
   $stored = variable_get('apachesolr_index_last', array());
   unset($stored['apachesolr_search']);
   variable_set('apachesolr_index_last', $stored);