diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 53087700b1..5f5eaf97ba 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2012-10-15  Tom Tromey  <tromey@redhat.com>
+
+	PR python/14635:
+	* python/py-symtab.c (del_objfile_sal): Set 'symtab' field
+	to Py_None.
+
 2012-10-15  Tom Tromey  <tromey@redhat.com>
 
 	PR python/14634:
diff --git a/gdb/python/py-symtab.c b/gdb/python/py-symtab.c
index b6f45e6d8d..21a172cadd 100644
--- a/gdb/python/py-symtab.c
+++ b/gdb/python/py-symtab.c
@@ -470,7 +470,10 @@ del_objfile_sal (struct objfile *objfile, void *datum)
     {
       sal_object *next = obj->next;
 
-      obj->symtab = NULL;
+      Py_DECREF (obj->symtab);
+      obj->symtab = (symtab_object *) Py_None;
+      Py_INCREF (Py_None);
+
       obj->next = NULL;
       obj->prev = NULL;
       xfree (obj->sal);
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 71c2d85e3a..38a3693276 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2012-10-15  Tom Tromey  <tromey@redhat.com>
+
+	* gdb.python/py-symtab.exp: Test sal and symtab destructors.
+
 2012-10-15  Tom Tromey  <tromey@redhat.com>
 
 	* gdb.python/py-symbol.exp: Test symbol destructor.
diff --git a/gdb/testsuite/gdb.python/py-symtab.exp b/gdb/testsuite/gdb.python/py-symtab.exp
index da0c3e4be2..0d3a5f2d83 100644
--- a/gdb/testsuite/gdb.python/py-symtab.exp
+++ b/gdb/testsuite/gdb.python/py-symtab.exp
@@ -73,3 +73,6 @@ gdb_test "python print \"simple_struct\" in static_symbols" "True" "Test simple_
 gdb_unload
 gdb_test "python print sal.is_valid()" "False" "Test sal.is_valid"
 gdb_test "python print symtab.is_valid()" "False" "Test symtab.is_valid()"
+
+gdb_test_no_output "python sal = None" "Test sal destructor"
+gdb_test_no_output "python symtab = None" "Test symtab destructor"