diff --git a/slc/trunk/src/options.cc b/slc/trunk/src/options.cc
index 4d06f62df6850065a780db70bd106127f267792d..0e03f522775d56577ccc3beeb7d436b3afd9569e 100644
--- a/slc/trunk/src/options.cc
+++ b/slc/trunk/src/options.cc
@@ -100,6 +100,14 @@ Options &Options::load(int argc, char *argv[]) {
 Options &Options::loadenv() {
   const char *senv;
 
+  // Get slc server ip
+  if ((senv = getenv("SLC_SERVER")) != 0 && *senv != 0)
+    server = senv;
+
+  // Get slc port
+  if ((senv = getenv("SLC_PORT")) != 0 && *senv != 0)
+    port = atoi(senv);
+
   // Get history path
   if ((senv = getenv("SLC_HISTORY_FILE")) != 0 && *senv != 0)
     history_file = senv;