diff -Naur tspc-advanced.orig/include/tsp_redirect.h tspc-advanced/include/tsp_redirect.h
--- tspc-advanced.orig/include/tsp_redirect.h	2007-04-11 13:51:54.000000000 +0200
+++ tspc-advanced/include/tsp_redirect.h	2007-04-11 13:52:48.000000000 +0200
@@ -5,8 +5,8 @@
 #include "config.h"
 #include "xml_tun.h"
 
-#define DEFAULT_REDIRECT_LAST_SERVER_FILE		"tsp-last-server.txt"
-#define DEFAULT_REDIRECT_BROKER_LIST_FILE		"tsp-broker-list.txt"
+#define DEFAULT_REDIRECT_LAST_SERVER_FILE		"/tmp/tsp-last-server.txt"
+#define DEFAULT_REDIRECT_BROKER_LIST_FILE		"/tmp/tsp-broker-list.txt"
 
 #define MAX_REDIRECT_ADDRESS_LENGTH				255
 #define MAX_REDIRECT_LAST_SERVER_LENGTH			255	
diff -Naur tspc-advanced.orig/src/tsp/tsp_client.c tspc-advanced/src/tsp/tsp_client.c
--- tspc-advanced.orig/src/tsp/tsp_client.c	2007-04-11 13:51:54.000000000 +0200
+++ tspc-advanced/src/tsp/tsp_client.c	2007-04-11 13:53:20.000000000 +0200
@@ -939,6 +939,11 @@
 	    continue;
 	  }
 
+	  // Do not loop on no-retry
+	  if (c.retry == 0) {
+		  connected = 0;
+		  continue;
+	  }
 	  //Display (LOG_LEVEL_1, ELInfo, "tspMain", HEX_STR_DISCONNECTED_RETRY, tspGetErrorByCode(status), c.retry);
 		Display (LOG_LEVEL_1, ELInfo, "tspMain", HEX_STR_DISCONNECTED_RETRY, c.retry);
 		SLEEP(c.retry);