diff --git a/saltapi/cli.py b/saltapi/cli.py
index 0cb145a8dc..7eaa84b9a0 100644
--- a/saltapi/cli.py
+++ b/saltapi/cli.py
@@ -33,8 +33,13 @@ class SaltAPI(OptionParser, ConfigDirMixIn, LogLevelMixIn, PidfileMixin,
 
     VERSION = saltapi.version.__version__
 
+    # ConfigDirMixIn config filename attribute
+    _config_filename_ = 'master'
+    # LogLevelMixIn attributes
+    _default_logging_logfile_ = '/var/log/salt/api'
+
     def setup_config(self):
-        return saltapi.config.api_config(self.get_config_file_path('master'))
+        return saltapi.config.api_config(self.get_config_file_path())
 
     def run(self):
         '''
diff --git a/saltapi/config.py b/saltapi/config.py
index ed1abe069f..05bb5bc378 100644
--- a/saltapi/config.py
+++ b/saltapi/config.py
@@ -8,7 +8,7 @@ import salt.config
 DEFAULT_API_OPTS = {
     # ----- Salt master settings overridden by Salt-API --------------------->
     'pidfile': '/var/run/salt-api.pid',
-    'logfile': '/var/log/api',
+    'logfile': '/var/log/salt/api',
     # <---- Salt master settings overridden by Salt-API ----------------------
 }