diff --git a/README b/README
index fa879467..ec7b69fa 100644
--- a/README
+++ b/README
@@ -73,7 +73,8 @@ To build SparkleShare you need:
 
 You can build and install SparkleShare like this:
 
-   $ ./configure (or ./autogen if you got SparkleShare from the repository)
+   $ ./configure (or ./autogen if you got SparkleShare from the repository,
+     append --prefix=/usr if you want the Nautilus extension to work)
    $ make
    $ sudo make install
 
diff --git a/SparkleLib/SparkleListener.cs b/SparkleLib/SparkleListener.cs
index fecf0f66..520dfded 100644
--- a/SparkleLib/SparkleListener.cs
+++ b/SparkleLib/SparkleListener.cs
@@ -43,6 +43,7 @@ namespace SparkleLib {
 			Channel = channel;
 			Nick    = nick.Replace ("@", "_at_").Replace (".", "_dot_");
 
+			// Keep the nick short
 			if (Nick.Length > 9)
 				Nick = Nick.Substring (0, 9);
 
@@ -51,9 +52,9 @@ namespace SparkleLib {
 			Server  = "irc.gnome.org";
 
 			Client = new IrcClient () {
-				PingTimeout          = 60,
-				SocketSendTimeout    = 60,
-				SocketReceiveTimeout = 60,
+				PingTimeout          = 90,
+				SocketSendTimeout    = 90,
+				SocketReceiveTimeout = 90,
 				AutoRetry            = true,
 				AutoReconnect        = true,
 				AutoRejoin           = true