diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00b0a7e..7552ac8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,2 +1,3 @@
-* ENHANCEMENT
-  * add custom modules auto-detection
+- ENHANCEMENT
+  - add custom modules auto-detection
+  - allow different naming for the directory based config file `.later|.later.yml|.later.yaml`
diff --git a/ansiblelater/settings.py b/ansiblelater/settings.py
index 756430f..3989001 100644
--- a/ansiblelater/settings.py
+++ b/ansiblelater/settings.py
@@ -71,9 +71,9 @@ class Settings(object):
         defaults = self._get_defaults()
         source_files = []
         source_files.append(self.config_file)
-        source_files.append(
-            os.path.relpath(os.path.normpath(os.path.join(os.getcwd(), ".later.yml")))
-        )
+        source_files.append(os.path.join(os.getcwd(), ".later"))
+        source_files.append(os.path.join(os.getcwd(), ".later.yml"))
+        source_files.append(os.path.join(os.getcwd(), ".later.yaml"))
         cli_options = self.args
 
         for config in source_files:
diff --git a/docs/content/configuration/_index.md b/docs/content/configuration/_index.md
index 365072d..d412da2 100644
--- a/docs/content/configuration/_index.md
+++ b/docs/content/configuration/_index.md
@@ -8,7 +8,7 @@ Changes can be made in a YAML configuration file or through CLI options which wi
 
 - default configuration (build-in)
 - global configuration file (this will depend on your operating system)
-- directory based configuration file (`.later.yml` file in current working directory)
+- folder-based configuration file (.later.yml|.later.yaml|.later) in current working directory
 - CLI options
 
 Be careful! YAML Attributes will be overwritten while lists in any configuration file will be merged.