diff --git a/pkgfs.conf b/pkgfs.conf
index 97353be6857..28a53685aa9 100644
--- a/pkgfs.conf
+++ b/pkgfs.conf
@@ -6,12 +6,12 @@
 # Global master directory: this is where all symlinks will be
 # created pointing at packages installed in PKGFS_DESTDIR.
 #
-PKGFS_MASTERDIR=$HOME/pkgfs/depot
+PKGFS_MASTERDIR=$HOME/pkgfs
 
 # Global destination dir: this is where all
 # packages will be installed.
 #
-PKGFS_DESTDIR=$HOME/pkgfs/depot/packages
+PKGFS_DESTDIR=$HOME/pkgfs/packages
 
 #
 # Global directory where source files will be extracted to.
@@ -23,12 +23,18 @@ PKGFS_BUILDDIR=$HOME/pkgfs/builddir
 #
 PKGFS_SRC_DISTDIR=$HOME/pkgfs/distdir
 
+#
+# Global directory where templates and patches are stored.
+#
+PKGFS_TEMPLATESDIR=$HOME/pkgfs/templates
+
+#
+# Path to the xstow program.
+#
+PKGFS_XSTOW_CMD=$PKGFS_MASTERDIR/bin/xstow
+
 #
 # Compilation flags for cc and c++.
 #
 PKGFS_CFLAGS="-O2 -pipe"
 PKGFS_CXXFLAGS="$PKGFS_CFLAGS"
-
-#
-# END
-#