diff --git a/src/warden-client/etc/warden-client.conf b/src/warden-client/etc/warden-client.conf
index 82f6ee2f0cd4c3c1a939958702e51c58b8f3ea0f..fb571e344a52fc4d3da3692c0fcf6bba8801cd15 100644
--- a/src/warden-client/etc/warden-client.conf
+++ b/src/warden-client/etc/warden-client.conf
@@ -5,11 +5,6 @@
 #
 # Use of this source is governed by a BSD-style license, see LICENSE file.
 
-#-------------------------------------------------------------------------------
-# BASEDIR - base directory of Warden client
-#-------------------------------------------------------------------------------
-$BASEDIR = "/opt/warden-client";
-
 #-------------------------------------------------------------------------------
 # URI - URI address of Warden server
 #-------------------------------------------------------------------------------
diff --git a/src/warden-client/etc/warden-client.conf.tmpl b/src/warden-client/etc/warden-client.conf.tmpl
index 32cfe4fede85c0bfa4699e42937c8e6b29851fcb..f31fe2a751f499660a7ee76cdefd9f06ae13e0d2 100644
--- a/src/warden-client/etc/warden-client.conf.tmpl
+++ b/src/warden-client/etc/warden-client.conf.tmpl
@@ -5,11 +5,6 @@
 #
 # Use of this source is governed by a BSD-style license, see LICENSE file.
 
-#-------------------------------------------------------------------------------
-# BASEDIR - base directory of Warden client
-#-------------------------------------------------------------------------------
-$BASEDIR = "_BASEDIR_";
-
 #-------------------------------------------------------------------------------
 # URI - URI address of Warden server
 #-------------------------------------------------------------------------------
diff --git a/src/warden-client/etc/warden-client.conf.tmpl.update b/src/warden-client/etc/warden-client.conf.tmpl.update
index 8ae69ae39b4272a625daded1d529aec8be02b6b5..113b751203226ca61d1954720a38d034fb48234c 100644
--- a/src/warden-client/etc/warden-client.conf.tmpl.update
+++ b/src/warden-client/etc/warden-client.conf.tmpl.update
@@ -5,11 +5,6 @@
 #
 # Use of this source is governed by a BSD-style license, see LICENSE file.
 
-#-------------------------------------------------------------------------------
-# BASEDIR - base directory of Warden client
-#-------------------------------------------------------------------------------
-$BASEDIR = "_BASEDIR_";
-
 #-------------------------------------------------------------------------------
 # URI - URI address of Warden server
 #-------------------------------------------------------------------------------