diff --git a/ChangeLog b/ChangeLog
index 28514b8..b90a1e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,38 @@
+2006-03-05 01:07  tchernobog
+
+	* trunk/src/templates/smartp.tcc: - Fix obscure bug (with reference
+	  initialization, or nested name specifiers?)
+
+2006-03-04 13:46  tchernobog
+
+	* trunk/src/backend/pyloader/sgpem.i: - Remove non-const method from
+	  Python-exported interface that allowed to change a
+	  SchedulableStatus from a user Policy
+
+2006-03-03 21:04  tchernobog
+
+	* trunk/Makefile.am,
+	  trunk/src/backend/pyloader/python_policy_manager.cc,
+	  trunk/src/main.cc: - Reorganize makefile to install files in a
+	  reorganized directory hierarchy: - make room for future plugins -
+	  separate real plugins from their satellite helper data
+
+2006-02-26 23:38  tchernobog
+
+	* trunk/src/backend/pyloader/python_policy.cc,
+	  trunk/src/backend/scheduler.cc,
+	  trunk/src/builtin-policies/fcfs.py: - Catch UserInterruptException
+	  launched from PythonPolicy in Scheduler, but it cheerfully
+	  segfaults python...
+
+2006-02-25 19:32  tchernobog
+
+	* trunk/ChangeLog, trunk/m4/ac_python_devel.m4,
+	  trunk/src/graphical_terminal_io.cc,
+	  trunk/src/graphical_terminal_io.hh: - Update ac_python_devel macro
+	  to integrate advice from Horst - Improve a little
+	  GraphicalTerminalIo
+
 2006-02-25 12:40  tchernobog
 
 	* trunk/Makefile.am, trunk/src/backend/plugin.hh,
diff --git a/Makefile.am b/Makefile.am
index 581fe1e..d359e90 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,6 +41,7 @@ pkglib_LTLIBRARIES =
 EXTRA_DIST =
 MAINTAINERCLEANFILES =
 MOSTLYCLEANFILES =
+CLEANFILES =
 
 # ############################################################
 #
@@ -345,3 +346,6 @@ src_testsuite_test_python_loader_SOURCES = \
 		src/observer.cc \
 		src/simulation.cc
 
+# Workaround an automake bug that leaves behind some files 
+# while it's finishing the distcheck target
+CLEANFILES += src/testsuite/.libs/test-python_loader
diff --git a/po/sgpemv2.pot b/po/sgpemv2.pot
index 16e6e93..0bca696 100644
--- a/po/sgpemv2.pot
+++ b/po/sgpemv2.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: matteo@member.fsf.org\n"
-"POT-Creation-Date: 2006-02-24 13:27+0100\n"
+"POT-Creation-Date: 2006-03-05 23:32+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,15 +36,15 @@ msgstr ""
 msgid "Exit"
 msgstr ""
 
-#: src/graphical_terminal_io.cc:44
+#: src/graphical_terminal_io.cc:47
 msgid "Textual Simulation Log"
 msgstr ""
 
-#: src/graphical_terminal_io.cc:60
+#: src/graphical_terminal_io.cc:70
 msgid "Send Command"
 msgstr ""
 
-#: src/backend/scheduler.cc:86
+#: src/backend/scheduler.cc:96
 msgid ""
 "\n"
 "No initial state inserted!!\n"