2 files changed, 5 insertions, 2 deletions
diff --git a/src/client.cpp b/src/client.cpp
index d7fbea6aa..46f8c2310 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -123,6 +123,7 @@
 
 #include <sys/stat.h>
 
+#include <climits>
 #include <iostream>
 #include <fstream>
 
@@ -134,7 +135,7 @@
  * Tells the max tick value,
  * setting it back to zero (and start again).
  */
-static const int MAX_TICK_VALUE = 10000;
+static const int MAX_TICK_VALUE = INT_MAX / 2;
 
 // TODO: Get rid fo these globals
 std::string errorMessage;
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 522a3e259..774061137 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -73,10 +73,12 @@
 
 #include "mumblemanager.h"
 
+#include <climits>
+
 #include "debug.h"
 
 static const short awayLimitTimer = 60;
-static const int MAX_TICK_VALUE = 10000;
+static const int MAX_TICK_VALUE = INT_MAX / 2;
 
 typedef std::map<int, Guild*>::const_iterator GuildMapCIter;