diff --git a/AUTHORS.rst b/AUTHORS.rst
index f5d50da..7ceed61 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -20,6 +20,7 @@ Mikhail Silonov <silonov.pro>
 Patryk Zawadzki <patrys@room-303.com>
 Paul McLanahan <paul@mclanahan.net>
 Rinat Shigapov <rinatshigapov@gmail.com>
+rsenkbeil <github.com/rsenkbeil>
 Ryan Kaskel <dev@ryankaskel.com>
 Simon Meers <simon@simonmeers.com>
 sayane
diff --git a/CHANGES.rst b/CHANGES.rst
index 9649041..7bb43cc 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,9 @@ CHANGES
 master (unreleased)
 -------------------
 
+* Fix ``InheritanceManager`` with self-referential FK; avoid infinite
+  recursion. Thanks rsenkbeil. Merge of GH-114.
+
 2.0.2 (2014.02.19)
 -------------------