diff --git a/apps/documents/conf/settings.py b/apps/documents/conf/settings.py
index dac0269c8a..420c41b3ba 100644
--- a/apps/documents/conf/settings.py
+++ b/apps/documents/conf/settings.py
@@ -9,8 +9,8 @@ default_available_functions = {
 }
 
 AVAILABLE_FUNCTIONS = getattr(settings, 'DOCUMENTS_METADATA_AVAILABLE_FUNCTIONS', default_available_functions)
-STAGING_DIRECTORY = getattr(settings, 'DOCUMENTS_STAGING_DIRECTORY', u'/tmp')
-FILESERVING_PATH = getattr(settings, 'DOCUMENTS_FILESERVING_PATH', u'/tmp')
+STAGING_DIRECTORY = getattr(settings, 'DOCUMENTS_STAGING_DIRECTORY', u'/tmp/mayan/staging')
+FILESERVING_PATH = getattr(settings, 'DOCUMENTS_FILESERVING_PATH', u'/tmp/mayan/documents')
 DELETE_LOCAL_ORIGINAL = getattr(settings, 'DOCUMENTS_DELETE_LOCAL_ORIGINAL', False)
 SLUGIFY_PATH = getattr(settings, 'DOCUMENTS_SLUGIFY_PATH', False)
 CHECKSUM_FUNCTION = getattr(settings, 'DOCUMENTS_CHECKSUM_FUNCTION', lambda x: hashlib.sha256(x).hexdigest())
diff --git a/settings.py b/settings.py
index 386bdce0bc..a53c7ca944 100644
--- a/settings.py
+++ b/settings.py
@@ -165,12 +165,14 @@ LOGIN_EXEMPT_URLS = (
 #WEB_THEME = 'default'
 #---------- Documents ------------------
 #DOCUMENTS_METADATA_AVAILABLE_FUNCTIONS = {}
-#DOCUMENTS_STAGING_DIRECTORY = u'/tmp'
-#DOCUMENTS_FILESERVING_PATH = u'/tmp'
+#DOCUMENTS_STAGING_DIRECTORY = u'/tmp/mayan/staging'
+#DOCUMENTS_FILESERVING_PATH = u'/tmp/mayan/documents'
 #DOCUMENTS_DELETE_LOCAL_ORIGINAL = False
 #DOCUMENTS_SLUGIFY_PATH = False
 #DOCUMENTS_CHECKSUM_FUNCTION = lambda x: hashlib.sha256(x).hexdigest())
 #DOCUMENTS_DELETE_STAGING_FILE_AFTER_UPLOAD = False
+#DOCUMENTS_UUID_FUNTION = lambda:unicode(uuid.uuid4())
+#DOCUMENTS_STORAGE_DIRECTORY_NAME = 'documents'
 #======== End of configuration options =======
 
 try: