diff --git a/Makefile b/Makefile
index 8e76db03..9d47dcd1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-$prefix=/usr/local
+prefix=/usr/local
 LIBDIR=$(prefix)/lib
 BINDIR=$(prefix)/bin
 DATADIR=$(prefix)/share
diff --git a/README b/README
index 987b3684..d635b3fe 100644
--- a/README
+++ b/README
@@ -69,11 +69,12 @@ the Creative Commons BY license (http://creativecommons.org/licenses/by/2.0/)
 	Thanks
 =======================
 = People =
- Link Mauve - Code
+ Link Mauve - Code (a little)
  Erwan Briand - Handler and MultiUserChat classes
  Gaëtan Ribémont (http://www.bonbref.com) - Logo design
  Ovart - Testing
  mathieui - Testing
+ Gapan - Makefile
 = Project =
  Gajim - send_vcard method and common.py
 
diff --git a/src/gui.py b/src/gui.py
index 6d046a89..299770eb 100644
--- a/src/gui.py
+++ b/src/gui.py
@@ -264,7 +264,7 @@ class Gui(object):
         # build the list of the recent words
         char_we_dont_want = [',', '(', ')', '.']
         words = list()
-        for msg in self.current_room().messages[:-6:-1]:
+        for msg in self.current_room().messages[:-9:-1]:
             for word in msg.txt.split():
                 for char in char_we_dont_want: # remove the chars we don't want
                     word = word.replace(char, '')
diff --git a/src/multiuserchat.py b/src/multiuserchat.py
index 89001cd4..a64b5796 100644
--- a/src/multiuserchat.py
+++ b/src/multiuserchat.py
@@ -304,7 +304,7 @@ class MultiUserChat(object):
         qp = iq_obj.getTag('query')
         if config.get('send_poezio_info', 'true') == 'true':
             qp.setTagData('name', 'Poezio')
-            qp.setTagData('version', '0.6.2 beta')
+            qp.setTagData('version', '0.6.2')
         else:
             qp.setTagData('name', 'Unknown')
             qp.setTagData('version', 'Unknown')