diff --git a/build.properties b/build.properties
index 0053ea3c11..8fe84fe174 100644
--- a/build.properties
+++ b/build.properties
@@ -7,8 +7,11 @@
 # SERVER CONFIGURATION #
 ##########################
 
-# DSpace installation directory. Data will be stored within this directory
-default.dspace.dir=/dspace
+# DSpace installation directory. This is the location where you want
+# to install DSpace. NOTE: this value will be copied over to the
+# "dspace.dir" setting in the final "dspace.cfg" file. It can be
+# modified later on in your "dspace.cfg", if needed.
+dspace.install.dir=/dspace
 
 # DSpace host name - should match base URL.  Do not include port number
 dspace.hostname = localhost
diff --git a/dspace/config/dspace.cfg b/dspace/config/dspace.cfg
index f3468682de..8125d8167f 100644
--- a/dspace/config/dspace.cfg
+++ b/dspace/config/dspace.cfg
@@ -24,7 +24,7 @@
 ##### Basic information ######
 
 # DSpace installation directory
-dspace.dir = ${default.dspace.dir}
+dspace.dir = ${dspace.install.dir}
 
 # DSpace host name - should match base URL.  Do not include port number.
 dspace.hostname = ${dspace.hostname}