diff --git a/evennia/locks/lockhandler.py b/evennia/locks/lockhandler.py
index a2ff65bf96..c13a204f41 100644
--- a/evennia/locks/lockhandler.py
+++ b/evennia/locks/lockhandler.py
@@ -114,7 +114,7 @@ from django.utils.translation import ugettext as _
 
 __all__ = ("LockHandler", "LockException")
 
-WARNING_LOG = "lockwarnings.log"
+WARNING_LOG = settings.LOCKWARNING_LOG_FILE
 
 #
 # Exception class. This will be raised
@@ -247,7 +247,7 @@ class LockHandler(object):
                 wlist.append(_("LockHandler on %(obj)s: access type '%(access_type)s' changed from '%(source)s' to '%(goal)s' " % \
                         {"obj":self.obj, "access_type":access_type, "source":locks[access_type][2], "goal":raw_lockstring}))
             locks[access_type] = (evalstring, tuple(lock_funcs), raw_lockstring)
-        if wlist:
+        if wlist and WARNING_LOG:
             # a warning text was set, it's not an error, so only report
             logger.log_file("\n".join(wlist), WARNING_LOG)
         if elist:
diff --git a/evennia/settings_default.py b/evennia/settings_default.py
index f413713e54..986110c891 100644
--- a/evennia/settings_default.py
+++ b/evennia/settings_default.py
@@ -119,6 +119,8 @@ LOG_DIR = os.path.join(GAME_DIR, 'server', 'logs')
 SERVER_LOG_FILE = os.path.join(LOG_DIR, 'server.log')
 PORTAL_LOG_FILE = os.path.join(LOG_DIR, 'portal.log')
 HTTP_LOG_FILE = os.path.join(LOG_DIR, 'http_requests.log')
+# if this is set to the empty string, lockwarnings will be turned off.
+LOCKWARNING_LOG_FILE = os.path.join(LOG_DIR, 'lockwarnings.log')
 # Rotate log files when server and/or portal stops. This will keep log
 # file sizes down. Turn off to get ever growing log files and never
 # loose log info.