diff --git a/appimagebuilder/__main__.py b/appimagebuilder/__main__.py
index f8e613ee..f2aac38c 100755
--- a/appimagebuilder/__main__.py
+++ b/appimagebuilder/__main__.py
@@ -11,6 +11,8 @@
 #  The above copyright notice and this permission notice shall be included in
 #  all copies or substantial portions of the Software.
 import logging
+import subprocess
+from importlib.metadata import version
 
 from appimagebuilder import recipe
 from appimagebuilder.cli.argparse import ArgumentsParser
@@ -25,6 +27,11 @@ def __main__():
 
     _setup_logging_config(args)
 
+    if args.version:
+        print("appimage-builder version", version("appimage-builder"))
+        subprocess.call(("appimagetool", "--version"))
+        exit(0)
+
     if args.generate:
         generator = CommandGenerate()
         generator.generate()
diff --git a/appimagebuilder/cli/argparse.py b/appimagebuilder/cli/argparse.py
index 0a473f5f..0f273e00 100644
--- a/appimagebuilder/cli/argparse.py
+++ b/appimagebuilder/cli/argparse.py
@@ -19,6 +19,12 @@ class ArgumentsParser:
     def __init__(self):
         self.parser = argparse.ArgumentParser(description="AppImage crafting tool")
 
+        self.parser.add_argument(
+            "-v", "--version",
+            dest="version",
+            action="store_true",
+            help="Show the version of appimagetool and appimage-builder",
+        )
         self.parser.add_argument(
             "--recipe",
             dest="recipe",
diff --git a/setup.py b/setup.py
index 495aec6c..7ededcfb 100644
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,8 @@
 
 setuptools.setup(
     name="appimage_builder",
-    version="1.0.0",
+    use_scm_version=True,
+    setup_requires=['setuptools_scm'],
     author="Alexis Lopez Zubieta",
     author_email="contact@azubieta.net",
     description="Recipe based AppImage creation meta-tool",