diff --git a/melpa b/melpa
index bb9ad55d..a26cf830 100755
--- a/melpa
+++ b/melpa
@@ -1,61 +1,56 @@
 #!/bin/bash
 
-
 BASEDIR=`dirname $0`
 
+cd ${BASEDIR} || exit 1
+
 function melpa_update_epkgs {
     echo "Updating epkgs..."
-    cd ${BASEDIR}/epkgs || return 1
+    cd epkgs || return 1
     git pull
-    cd -
+    cd ..
     echo
 }
 
 function melpa_clear_packages {
     echo "*** Clearing the packages folder..."
-    rm ${BASEDIR}/packages/*
+    rm /packages/*
     echo
 }
 
 
 function melpa_build_pkglist {
     echo "*** Building all packages..."
-    cd ${BASEDIR} || return 1
     for pkg in `cat pkglist`; do
 	echo "Building package: $pkg"
 	./buildpkg $pkg
 	echo
 	echo
     done
-    cd -
     echo
 }
 
 function melpa_build_archive {
     echo "Building package: $pkg"
-    cd ${BASEDIR} || return 1
     emacs --batch -l package-build.el -u dcurtis --eval "(package-build-archive \"$1\")"
-    cd -
     echo
 }
 
 function melpa_sync {
     echo "*** Pushing changes to the server..."
-    cd ${BASEDIR} || return 1
     rsync -avz --delete packages webpage/index.html milkbox.net:webapps/melpa/
-    cd -
     echo
 }
 
 function melpa_generate_html {
     echo "*** Building webpage..."
-    cd ${BASEDIR}/webpage || return 1
+    cd webpage || return 1
     awk '{ if(/<!--list-of-packages-->/)
 while((getline < "../pkglist")>0)
 print "* " $0
 else print}' index.tmpl > index.md
     pandoc -s --mathml -t html --smart index.md > index.html
-    cd -
+    cd ..
     echo
 }