diff --git a/onetimepass/logging.py b/onetimepass/logging.py
index 1c96b6d..014b8f1 100644
--- a/onetimepass/logging.py
+++ b/onetimepass/logging.py
@@ -1,3 +1,4 @@
+import functools
 import logging
 
 from onetimepass import settings
@@ -10,9 +11,10 @@
 ```
 """
 
-logging.basicConfig(
+logging_basic_config = functools.partial(
+    logging.basicConfig,
     format="[%(asctime)s] %(levelname)s:%(module)s:%(lineno)d: %(message)s",
-    level=settings.LOG_LEVEL,
+    level=settings.DEFAULT_LOG_LEVEL,
 )
 
 logger = logging.getLogger(__name__)
diff --git a/onetimepass/otp.py b/onetimepass/otp.py
index f8d460b..79df313 100644
--- a/onetimepass/otp.py
+++ b/onetimepass/otp.py
@@ -2,6 +2,7 @@
 import datetime
 import functools
 import json
+import logging
 import pathlib
 import time
 from typing import Dict
@@ -32,6 +33,7 @@
 from onetimepass.exceptions import UnhandledFormatException
 from onetimepass.exceptions import UnhandledOTPTypeException
 from onetimepass.logging import logger
+from onetimepass.logging import logging_basic_config
 from onetimepass.otpauth import ParsingError
 from onetimepass.otpauth import Uri
 
@@ -122,11 +124,24 @@ def validation_error_to_str(error: pydantic.ValidationError) -> str:
     default=master_key.MasterKey.keyring_available(),
     show_default="True if keyring installed, False otherwise",
 )
+@click.option(
+    "debug",
+    "-d/-D",
+    "--debug/--no-debug",
+    default=False,
+    show_default=True,
+    help="Enable/disable debug info.",
+)
 @click.pass_context
-def otp(ctx: click.Context, color: bool, quiet: bool, keyring_: bool):
+def otp(ctx: click.Context, color: bool, quiet: bool, keyring_: bool, debug: bool):
     ctx.ensure_object(dict)
     ctx.obj.update({"color": color, "quiet": quiet, "keyring_": keyring_})
 
+    if debug:
+        logging_basic_config(level=logging.DEBUG)
+    else:
+        logging_basic_config()
+
 
 @otp.command(help="Print the one-time password for the specified ALIAS.")
 @click.argument("alias")
diff --git a/onetimepass/settings.py b/onetimepass/settings.py
index d36e0f9..26e5bfa 100644
--- a/onetimepass/settings.py
+++ b/onetimepass/settings.py
@@ -17,6 +17,4 @@
 KEYRING_SERVICE_NAME = APP_NAME
 KEYRING_USERNAME = "master key"
 
-LOG_LEVEL = (
-    logging.DEBUG
-)  # TODO change this for the production version OR implement CLI option for that
+DEFAULT_LOG_LEVEL = logging.WARNING