diff --git a/HowToSetupBuildbotForMelange.wiki b/HowToSetupBuildbotForMelange.wiki
index 45f5b88..4148f86 100644
--- a/HowToSetupBuildbotForMelange.wiki
+++ b/HowToSetupBuildbotForMelange.wiki
@@ -8,13 +8,14 @@
 = Instructions =
 
 {{{
+  $ BASEDIR='/mnt/teraref'
   $ wget https://raw.github.com/pypa/pip/master/contrib/get-pip.py
   $ sudo python get-pip.py‎
   $ sudo pip install virtualenv
   $ sudo apt-get update
   $ sudo apt-get install libcurl4-gnutls-dev libexpat1-dev gettext libz-dev libssl-dev python-lxml python-dev 
   $ sudo apt-get install libxml2-dev libxslt1-dev xvfb openjdk-7-jre
-  $ cd /mnt/teraref/; mkdir buildbot; cd buildbot;
+  $ cd $BASEDIR; mkdir buildbot; cd buildbot;
   $ virtualenv venv; cd venv;  . bin/activate
   $ pip install buildbot buildbot-slave
   $ buildbot create-master master
@@ -25,24 +26,25 @@
   # If the logs appear okay, we're good to go!
  
   # Let's create a slave, and see if it's running okay.
-  $ cd ~/venv; buildslave create-slave slave localhost:9989 example-slave pass
+  $ cd $BASEDIR/buildbot/venv; buildslave create-slave slave localhost:9989 example-slave pass
   $ buildslave start slave; tail -f slave/twistd.log
   # Again, If the logs appear okay, we're good to go!
 }}}
 
-The next step involves copying the config files from `/configuration` directory in melange-project-root, to the buildbot machine's master folder - `~/venv/master/`
+The next step involves copying the config files from `/configuration` directory in melange-project-root, to the buildbot machine's master folder - `$BASEDIR/buildbot/venv/master/`
 The file private.py has some fields, whose description is documented in the file itself. The fields are pretty straightforward, and the description about them in the same file should be sufficient. 
 
 Now, let's restart the buildbot - 
 
 {{{
-  $ cd ~/venv/master
+  $ cd $BASEDIR/buildbot/venv/master
   $ buildbot restart
 }}}
 
 At this point, it might make sense to run these commands, just to check everything is in order - 
 
 {{{
+  $ cd $BASEDIR/buildbot/venv
   $ buildbot master start; tail -f master/twistd.log
   $ buildslave start slave; tail -f slave/twistd.log
 }}}