diff -up gogoc-1_2-RELEASE/gogoc-tsp/Makefile.dirpath gogoc-1_2-RELEASE/gogoc-tsp/Makefile
--- gogoc-1_2-RELEASE/gogoc-tsp/Makefile.dirpath
+++ gogoc-1_2-RELEASE/gogoc-tsp/Makefile
@@ -47,8 +47,10 @@ SUPPORTED_PLATFORMS=linux netbsd freebsd openbsd darwin sunos gogocpe
 
 INSTALL_DIR   :=$(installdir)
 INSTALL_BIN   :=$(INSTALL_DIR)/bin
-INSTALL_MAN   :=$(INSTALL_DIR)/man
-INSTALL_TEMPL :=$(INSTALL_DIR)/template
+INSTALL_SHARE :=$(INSTALL_DIR)/share
+INSTALL_MAN   :=$(INSTALL_DIR)/share/man
+INSTALL_TEMPL :=$(INSTALL_DIR)/share/gogoc/template
+INSTALL_CFG   :=$(INSTALL_DIR)/../etc/gogoc
 
 
 SUBDIRS=$(PWD)/src/lib \
@@ -168,15 +170,16 @@ install: check-gogoc-install all
 	@mkdir -p $(INSTALL_BIN)
 	@mkdir -p $(INSTALL_MAN)
 	@mkdir -p $(INSTALL_TEMPL)
+	@mkdir -p $(INSTALL_CFG)
 
 	@for dir in ${SUBDIRS}; do \
 	    $(MAKE) -C $$dir install || exit 1; \
 	done
 
 	@cp $(TARGET) $(INSTALL_BIN)
-	@cp $(BIN_DIR)/gogoc.conf.sample $(INSTALL_BIN)
-	@[ -f $(INSTALL_BIN)/gogoc.conf ] || { \
-	    cp $(INSTALL_BIN)/gogoc.conf.sample $(INSTALL_BIN)/gogoc.conf; \
+	@cp $(BIN_DIR)/gogoc.conf.sample $(INSTALL_CFG)
+	@[ -f $(INSTALL_CFG)/gogoc.conf ] || { \
+	    cp $(INSTALL_CFG)/gogoc.conf.sample $(INSTALL_CFG)/gogoc.conf; \
 	}
 
 
diff -up gogoc-1_2-RELEASE/gogoc-tsp/conf/gogoc.conf.in.dirpath gogoc-1_2-RELEASE/gogoc-tsp/conf/gogoc.conf.in
--- gogoc-1_2-RELEASE/gogoc-tsp/conf/gogoc.conf.in.dirpath
+++ gogoc-1_2-RELEASE/gogoc-tsp/conf/gogoc.conf.in
@@ -120,7 +120,7 @@ dns_server=
 #   Directory where the gogoCLIENT will be installed. This value has been 
 #   set during installation.
 #
-gogoc_dir=@conf_gogoc_dir@
+gogoc_dir=/etc/gogoc
 
 #
 # Auto-Retry Connect, Retry Delay and Max Retry Delay:
@@ -224,7 +224,7 @@ proxy_client=no
 #
 #   broker_list=<file_name>
 #  
-broker_list=tsp-broker-list.txt
+broker_list=/var/lib/gogoc/tsp-broker-list.txt
 
 #
 # Last Server Used File Name:
@@ -234,7 +234,7 @@ broker_list=tsp-broker-list.txt
 #
 #   last_server=<file_name>
 #
-last_server=tsp-last-server.txt
+last_server=/var/lib/gogoc/tsp-last-server.txt
 
 #
 # Always Use Last Known Working Server:
@@ -294,7 +294,7 @@ always_use_same_server=no
 #
 #   log_filename=<file_name>
 #
-log_filename=gogoc.log
+log_filename=/var/log/gogoc/gogoc.log
 
 #
 # Log File Rotation:
diff -up gogoc-1_2-RELEASE/gogoc-tsp/platform/freebsd/tsp_local.c.dirpath gogoc-1_2-RELEASE/gogoc-tsp/platform/freebsd/tsp_local.c
--- gogoc-1_2-RELEASE/gogoc-tsp/platform/freebsd/tsp_local.c.dirpath
+++ gogoc-1_2-RELEASE/gogoc-tsp/platform/freebsd/tsp_local.c
@@ -34,11 +34,11 @@ Copyright (c) 2001-2007 gogo6 Inc. All rights reserved.
 #define IFNAMSIZ 16     // from net/if.h
 
 
-char *FileName  = "gogoc.conf";
+char *FileName  = "/etc/gogoc/gogoc.conf";
 char *ScriptInterpretor = "/bin/sh";
 char *ScriptExtension = "sh";
 char *ScriptDir = NULL;
-char *TspHomeDir = "/usr/local/etc/gogoc";
+char *TspHomeDir = "/usr/share/gogoc";
 char DirSeparator = '/';
 
 int indSigHUP = 0;    // Set to 1 when HUP signal is trapped.
diff -up gogoc-1_2-RELEASE/gogoc-tsp/platform/linux/tsp_local.c.dirpath gogoc-1_2-RELEASE/gogoc-tsp/platform/linux/tsp_local.c
--- gogoc-1_2-RELEASE/gogoc-tsp/platform/linux/tsp_local.c.dirpath
+++ gogoc-1_2-RELEASE/gogoc-tsp/platform/linux/tsp_local.c
@@ -33,11 +33,11 @@ This source code copyright (c) gogo6 Inc. 2002-2007.
 
 /* these globals are defined by US used by alot of things in  */
 
-char *FileName  = "gogoc.conf";
+char *FileName  = "/etc/gogoc/gogoc.conf";
 char *ScriptInterpretor = "/bin/sh";
 char *ScriptExtension = "sh";
 char *ScriptDir = NULL;
-char *TspHomeDir = "/usr/local/etc/gogoc";
+char *TspHomeDir = "/usr/share/gogoc";
 char DirSeparator = '/';
 
 int indSigHUP = 0;    // Set to 1 when HUP signal is trapped.
diff -up gogoc-1_2-RELEASE/gogoc-tsp/src/tsp/tsp_auth_passdss.c.dirpath gogoc-1_2-RELEASE/gogoc-tsp/src/tsp/tsp_auth_passdss.c
--- gogoc-1_2-RELEASE/gogoc-tsp/src/tsp/tsp_auth_passdss.c.dirpath
+++ gogoc-1_2-RELEASE/gogoc-tsp/src/tsp/tsp_auth_passdss.c
@@ -31,7 +31,7 @@ Copyright (c) 2001-2007 gogo6 Inc. All rights reserved.
 
 #define TSP_AUTH_PASSDSS_STRING "PASSDSS-3DES-1"
 #define TSP_AUTH_PASSDSS_BUFFERSIZE 4096
-#define TSPC_DSA_KEYFILE "gogockeys.pub"
+#define TSPC_DSA_KEYFILE "/var/lib/gogoc/gogockeys.pub"
 
 #if defined(WIN32) && !defined(WINCE)
 extern BOOL IsService;    // Declared in winpc/tsp_local.c
diff -up gogoc-1_2-RELEASE/gogoc-tsp/template/linux.sh.dirpath gogoc-1_2-RELEASE/gogoc-tsp/template/linux.sh
--- gogoc-1_2-RELEASE/gogoc-tsp/template/linux.sh.dirpath
+++ gogoc-1_2-RELEASE/gogoc-tsp/template/linux.sh
@@ -9,6 +9,8 @@
 # Note: IPV6 support and tun Support must be enabled before calling this script.
 # 
 
+# Changed here for Debian systems - used for radvd config file only
+TSP_HOME_DIR=/var/run/gogoc
 
 LANGUAGE=C