diff --git a/src/httpserver.py b/src/httpserver.py
index ca7540931..9d5f35fb8 100644
--- a/src/httpserver.py
+++ b/src/httpserver.py
@@ -130,8 +130,8 @@ class SupyHTTPServerCallback:
     neither overriden this message or defined an handler for this query.""")
 
     def doGet(self, handler, path, *args, **kwargs):
-        handler.send_response(400)
-        self.send_header('Content_type', 'text/plain')
+        handler.send_response(404)
+        self.send_header('Content_type', 'text/plain; charset=utf-8')
         self.send_header('Content-Length', len(self.defaultResponse))
         self.end_headers()
         self.wfile.write(self.defaultResponse)
@@ -152,7 +152,7 @@ class Supy404(SupyHTTPServerCallback):
     trained to help you in such a case.""")
     def doGet(self, handler, path, *args, **kwargs):
         handler.send_response(404)
-        self.send_header('Content_type', 'text/plain')
+        self.send_header('Content_type', 'text/plain; charset=utf-8')
         self.send_header('Content-Length', len(self.response))
         self.end_headers()
         self.wfile.write(self.response)
@@ -181,7 +181,7 @@ class SupyIndex(SupyHTTPServerCallback):
             plugins = _('No plugins available.')
         else:
             plugins = '<ul><li>%s</li></ul>' % '</li><li>'.join(
-                    ['<a href="/%s">%s</a>' % (x,y.name) for x,y in plugins])
+                    ['<a href="/%s/">%s</a>' % (x,y.name) for x,y in plugins])
         response = self.template % plugins
         handler.send_response(200)
         self.send_header('Content_type', 'text/html')
diff --git a/src/version.py b/src/version.py
index 315c5cb30..e942f3068 100644
--- a/src/version.py
+++ b/src/version.py
@@ -1,3 +1,3 @@
 """stick the various versioning attributes in here, so we only have to change
 them once."""
-version = '0.83.4.1+limnoria (2011-09-18T10:31:09+0200)'
+version = '0.83.4.1+limnoria (2011-10-02T12:11:30+0200)'