diff --git a/Changelog b/Changelog
index 9952f363ae..8336caae58 100644
--- a/Changelog
+++ b/Changelog
@@ -19,6 +19,8 @@ version 0.5.2:
   - fixed PTE dirty bit handling
   - fixed xadd same reg bug
   - fixed cmpxchg exception safeness
+  - access to virtual memory in gdb stub
+  - task gate and NT flag fixes
 
 version 0.5.1:
   
diff --git a/TODO b/TODO
index 9d7ed03f82..088d7bc2da 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,7 @@
 short term:
 ----------
 - XP install bug fix
+- handle Self Modifying Code even if modifying current TB (BE OS 5 install)
 - L4 Pistachio kernel boot fix
 - TLB code protection support for PPC
 - add sysenter/sysexit and fxsr for L4 pistachio 686
@@ -10,7 +11,7 @@ short term:
 - user/kernel PUSHL/POPL in helper.c
 - keyboard output buffer filling timing emulation
 - verify tb_flush() with a20 and TLBs
-
+- return UD exception if LOCK prefix incorrectly used
 - cmos clock update and timers
 - test ldt limit < 7 ?
 - tests for each target CPU