diff --git a/doc/ChangeLog b/doc/ChangeLog
index 7db5183..aae8e65 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,6 @@
+2007-05-14 Jörgen Stenarson  <jorgen.stenarson -at- bostream.nu>
+	* pre_inputhook and startup_hook were not functioning properly.
+
 2007-05-09 Jörgen Stenarson  <jorgen.stenarson -at- bostream.nu>
 	* Fix ticket #153, python2.3 installation problem
 	* Updates to documentation
diff --git a/pyreadline/modes/basemode.py b/pyreadline/modes/basemode.py
index 1c82f69..8e9704a 100644
--- a/pyreadline/modes/basemode.py
+++ b/pyreadline/modes/basemode.py
@@ -22,8 +22,6 @@ class BaseMode(object):
         self.rlobj=rlobj
         self.exit_dispatch = {}
         self.key_dispatch = {}
-        self.startup_hook=None
-        self.pre_input_hook=None
         self.argument=1
         self.prevargument=None
         
@@ -60,6 +58,8 @@ class BaseMode(object):
     mark_directories=property(*_gs("mark_directories"))
     completer=property(*_gs("completer"))
     begidx=property(*_gs("begidx"))
+    startup_hook=property(*_gs("startup_hook"))
+    pre_input_hook=property(*_gs("pre_input_hook"))
     endidx=property(*_gs("endidx"))
     
     console=property(_g("console"))