diff --git a/irc.py b/irc.py
index 523a516..0fe8e26 100644
--- a/irc.py
+++ b/irc.py
@@ -30,7 +30,7 @@ class PesterIRC(QtCore.QThread):
     def IRCConnect(self):
         server = self.config.server()
         port = self.config.port()
-        self.cli = IRCClient(PesterHandler, host=server, port=int(port), nick=self.mainwindow.profile().handle, real_name='pcc31', blocking=True, timeout=15)
+        self.cli = IRCClient(PesterHandler, host=server, port=int(port), nick=self.mainwindow.profile().handle, real_name='pcc31', blocking=True, timeout=120)
         self.cli.command_handler.parent = self
         self.cli.command_handler.mainwindow = self.mainwindow
         self.cli.connect()
diff --git a/pesterchum.py b/pesterchum.py
index e766fef..f8d773b 100644
--- a/pesterchum.py
+++ b/pesterchum.py
@@ -1122,7 +1122,7 @@ class PesterWindow(MovingWindow):
         self.connect(self.pingtimer, QtCore.SIGNAL('timeout()'),
                 self, QtCore.SLOT('checkPing()'))
         self.lastping = int(time())
-        self.pingtimer.start(1000*10)
+        self.pingtimer.start(1000*90)
 
     @QtCore.pyqtSlot()
     def mspacheck(self):