diff --git a/Makefile.am b/Makefile.am
index 2d1ded8e..7dc6849d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -433,7 +433,9 @@ usbguard_SOURCES=\
src/CLI/usbguard-add-user.cpp \
src/CLI/usbguard-add-user.hpp \
src/CLI/usbguard-remove-user.cpp \
- src/CLI/usbguard-remove-user.hpp
+ src/CLI/usbguard-remove-user.hpp \
+ src/CLI/usbguard-print-version.cpp \
+ src/CLI/usbguard-print-version.hpp
usbguard_CXXFLAGS=\
$(PTHREAD_CFLAGS)
diff --git a/scripts/bash_completion/usbguard b/scripts/bash_completion/usbguard
index 312e912d..97c21ab5 100644
--- a/scripts/bash_completion/usbguard
+++ b/scripts/bash_completion/usbguard
@@ -251,7 +251,7 @@ _usbguard() {
# If there was no positional argument provided yet, complete commands
if [[ $args -eq 1 ]]; then
opts="get-parameter set-parameter list-devices allow-device block-device reject-device list-rules append-rule"
- opts="${opts} remove-rule generate-policy watch read-descriptor add-user remove-user"
+ opts="${opts} remove-rule generate-policy watch read-descriptor add-user remove-user --version"
else
opts='-h --help'
diff --git a/src/CLI/usbguard-print-version.cpp b/src/CLI/usbguard-print-version.cpp
new file mode 100644
index 00000000..30dc09c1
--- /dev/null
+++ b/src/CLI/usbguard-print-version.cpp
@@ -0,0 +1,83 @@
+//
+// Copyright (C) 2022 Red Hat, Inc.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// Authors: Attila Lakatos
+//
+#ifdef HAVE_BUILD_CONFIG_H
+ #include
+#endif
+
+#include "usbguard.hpp"
+#include "usbguard-print-version.hpp"
+
+#include "usbguard/IPCClient.hpp"
+
+#include
+#include