diff --git a/doc/ChangeLog b/doc/ChangeLog
index 1baf3cb..e450a57 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,9 +1,10 @@
-2006-11-06 Jörgen Stenarson  <jorgen.stenarson -at- bostream.nu>
+2006-11-13 Jörgen Stenarson  <jorgen.stenarson -at- bostream.nu>
 	* Fixed bug in tab completion when point is not at end of line
 	* Changed clr.AddReference to clr.AddReferenceToFileAndPath (ironpython_console)
 	* Fix points position after tab completion
 	* Fix for difference in handling of multiline input between cpython and ironpython (emacs.py)
 	* added test_complete case to emacs_test.py
+	* Ported changes to configuration/startup from trunk
 	
 2006-11-03 Jörgen Stenarson  <jorgen.stenarson -at- bostream.nu>
 	* Improvements in ironpython handling.
diff --git a/pyreadline/configuration/startup.py b/pyreadline/configuration/startup.py
index a52dacf..685a1c7 100644
--- a/pyreadline/configuration/startup.py
+++ b/pyreadline/configuration/startup.py
@@ -1,6 +1,8 @@
 # -*- coding: UTF-8 -*-
 # Example snippet to use in a PYTHONSTARTUP file
 try:
+    import pyreadline.rlmain
+    #pyreadline.rlmain.config_path=r"c:\xxx\pyreadlineconfig.ini"
     import readline,atexit
 except ImportError:
     print "Module readline not available."
@@ -10,5 +12,5 @@ else:
     #activate tab completion
     readline.parse_and_bind("tab: complete")
     readline.read_history_file()
-    atexit.register(pyreadline.write_history_file)
+    atexit.register(readline.write_history_file)
     del readline,rlcompleter,atexit