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/configure.ac b/configure.ac
index 1f5be3a3..2d783342 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([src/])
AC_CONFIG_HEADERS([src/build-config.h.in])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR([config])
+AC_CANONICAL_HOST
AM_INIT_AUTOMAKE([subdir-objects foreign tar-pax])
@@ -104,6 +105,11 @@ AC_SUBST(LT_CURRENT)
AC_SUBST(LT_REVISION)
AC_SUBST(LT_AGE)
+AC_DEFINE_UNQUOTED([PLATFORM_ID], ["${host}"], [platform id for display purposes])
+# we don't mind if we don't have the lsb_release utility. But if we have, it's
+# nice to have the extra information.
+AC_DEFINE_UNQUOTED([PLATFORM_ID_LSB], ["`lsb_release -d`"], [platform id for display purposes])
+
AC_ARG_ENABLE([coverage],
[AS_HELP_STRING([--enable-coverage], [enable instrumented compilation for code coverage testing (default=no)])],
[case "${enableval}" in
diff --git a/src/CLI/usbguard-print-version.cpp b/src/CLI/usbguard-print-version.cpp
new file mode 100644
index 00000000..b814db7a
--- /dev/null
+++ b/src/CLI/usbguard-print-version.cpp
@@ -0,0 +1,73 @@
+//
+// 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