diff --git a/src/org/april/hebdobot/cli/HebdobotCLI.java b/src/org/april/hebdobot/cli/HebdobotCLI.java
index 07650bc..6a79739 100644
--- a/src/org/april/hebdobot/cli/HebdobotCLI.java
+++ b/src/org/april/hebdobot/cli/HebdobotCLI.java
@@ -115,6 +115,11 @@ public class HebdobotCLI
                     else
                     {
                         configFile = new File(commandLine.getOptionValue("c"));
+
+                        if (configFile.isDirectory())
+                        {
+                            configFile = new File(configFile, DEFAULT_CONFIG_FILE);
+                        }
                     }
                 }
                 else
@@ -125,6 +130,17 @@ public class HebdobotCLI
                     // directory.
                     File currentDirectory = new File(System.getProperty("user.dir"));
                     configFile = new File(currentDirectory, DEFAULT_CONFIG_FILE);
+
+                    if (!configFile.exists())
+                    {
+                        File configDirectory = new File(currentDirectory.getParentFile(), "conf");
+                        File alternativeConfigFile = new File(configDirectory, DEFAULT_CONFIG_FILE);
+
+                        if (alternativeConfigFile.exists())
+                        {
+                            configFile = alternativeConfigFile;
+                        }
+                    }
                 }
 
                 if (configFile.exists())