diff --git a/.gitignore b/.gitignore
index b998519d..69b3cb48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,8 +5,10 @@
 *.iml
 broker/target/
 client/target/
-/parser_commons/target/netty_parser/target/
+parser_commons/target/
+netty_parser/target/
 netty_parser/target/
 parser_commons/target/
-/distribution/target/
-/bundle/target/
\ No newline at end of file
+distribution/target/
+broker/moquette.log
+broker/runner
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 9ac9441b..83f21709 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,7 +1,9 @@
 Version 0.5:
     Fix issue 20 (no flush of message on PINGREQ)
     Fix issue 21 (bad channel timeout handler)
-
+    Created a self contained distribution package (issue 22)
+    Fix issue 28, OSGi-fied the broker
+    
 Version 0.4:
     Dropped support for MINA
     Fix Issue 15 (bad re-activation of client's subscriptions after a recconection)