diff --git a/docs/extension_protocol.rst b/docs/extension_protocol.rst
index 742944a0b..ac8c09f90 100644
--- a/docs/extension_protocol.rst
+++ b/docs/extension_protocol.rst
@@ -126,12 +126,12 @@ An example of what the payload of a handshake message could look like:
 +-------------------+----------------------------------+
 | ``p``             | 6881                             |
 +-------------------+----------------------------------+
-| ``v``             | "µTorrent 1.2"                   |
+| ``v``             | "uTorrent 1.2"                   |
 +-------------------+----------------------------------+
 
 and in the encoded form:
 
-``d1:md11:LT_metadatai1e6:µT_PEXi2ee1:pi6881e1:v13:\xc2\xb5Torrent 1.2e``
+``d1:md11:LT_metadatai1e6:ut_pexi2ee1:pi6881e1:v12:uTorrent 1.2e``
 
 To make sure the extension names do not collide by mistake, they should be
 prefixed with the two (or one) character code that is used to identify the
diff --git a/docs/makefile b/docs/makefile
index c5606e846..1a94b0834 100644
--- a/docs/makefile
+++ b/docs/makefile
@@ -31,8 +31,13 @@ html: $(TARGETS:=.html) $(FIGURES:=.png)
 
 pdf: $(TARGETS:=.pdf) $(FIGURES:=.eps)
 
+epub: $(TARGETS:=.epub) $(FIGURES:=.png)
+
 all: html
 
+%.epub:%.rst
+	rst2epub $? $@
+
 %.pdf:%.rst
 	rst2pdf $? -o $@ --stylesheets stylesheet
 
diff --git a/docs/manual.rst b/docs/manual.rst
index 136c35e54..fe5796d90 100644
--- a/docs/manual.rst
+++ b/docs/manual.rst
@@ -6883,7 +6883,7 @@ invalid_request_alert
 ---------------------
 
 This is a debug alert that is generated by an incoming invalid piece request.
-``ìp`` is the address of the peer and the ``request`` is the actual incoming
+``ip`` is the address of the peer and the ``request`` is the actual incoming
 request from the peer.
 
 ::
@@ -8167,13 +8167,13 @@ Here's a simple example of how to translate error codes::
 		static const char const* swedish[] =
 		{
 			"inget fel",
-			"en fil i torrenten kolliderar med en fil från en annan torrent",
+			"en fil i torrenten kolliderar med en fil fran en annan torrent",
 			"hash check misslyckades",
-			"torrent filen är inte en dictionary",
-			"'info'-nyckeln saknas eller är korrupt i torrentfilen",
-			"'info'-fältet är inte en dictionary",
-			"'piece length' fältet saknas eller är korrupt i torrentfilen",
-			"torrentfilen saknar namnfältet",
+			"torrent filen ar inte en dictionary",
+			"'info'-nyckeln saknas eller ar korrupt i torrentfilen",
+			"'info'-faltet ar inte en dictionary",
+			"'piece length' faltet saknas eller ar korrupt i torrentfilen",
+			"torrentfilen saknar namnfaltet",
 			"ogiltigt namn i torrentfilen (kan vara en attack)",
 			// ... more strings here
 		};
diff --git a/docs/projects.rst b/docs/projects.rst
index cd764a4e4..08e4c4fa3 100644
--- a/docs/projects.rst
+++ b/docs/projects.rst
@@ -133,7 +133,7 @@ project listed here, let me_ know.
 	(ncurses) and one web interface
 	(accessable through a web browser).
 	Written by Michael Wojciechowski
-	and Johan Ström.
+	and Johan Strom.
 
 	.. _btg: http://btg.berlios.de//
 
@@ -148,7 +148,7 @@ project listed here, let me_ know.
 	**tvblob**
 
 	The BLOBbox_ represents the ability to harness all of the content available
-	on the web, without any filtering or pre-selection by a third party ¿ just
+	on the web, without any filtering or pre-selection by a third party just
 	like surfing the web.
 
 	This means that anyone will have the ability to reach viewers via the Internet