diff --git a/src/joybuttontypes/joybutton.cpp b/src/joybuttontypes/joybutton.cpp
index 08048e263..b3d0b75b9 100644
--- a/src/joybuttontypes/joybutton.cpp
+++ b/src/joybuttontypes/joybutton.cpp
@@ -118,7 +118,7 @@ JoyButton::JoyButton(int sdl_button_index, int originset, SetJoystick *parentSet
     m_index_sdl = sdl_button_index;
     m_originset = originset;
     quitEvent = true;
-    VERBOSE() << "Created button with ID: " << m_index_sdl << " For set: " << originset << " Name: " << getName();
+    DEBUG() << "Created button with ID: " << m_index_sdl << " For set: " << originset << " Name: " << getName();
 }
 
 JoyButton::~JoyButton()
diff --git a/src/main.cpp b/src/main.cpp
index f9a3b2801..aaddd9e4f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -221,6 +221,24 @@ void importLegacySettingsIfExist()
     }
 }
 
+void log_system_config()
+{
+    VERBOSE() << "AntiMicroX version: " << PadderCommon::programVersion
+#ifdef ANTIMICROX_PKG_VERSION
+              << " Package: " << ANTIMICROX_PKG_VERSION
+#endif
+#ifdef QT_DEBUG
+              << " Type: Debug"
+#else
+              << " Type: Release"
+#endif
+        ;
+    VERBOSE() << "SDL version: " << PadderCommon::sdlVersionUsed << " (Compiled with: " << PadderCommon::sdlVersionCompiled
+              << ")";
+    VERBOSE() << QString("Host OS: %1 Version: %2 Architecture: %3")
+                     .arg(QSysInfo::productType(), QSysInfo::productVersion(), QSysInfo::currentCpuArchitecture());
+}
+
 int main(int argc, char *argv[])
 {
     qInstallMessageHandler(Logger::loggerMessageHandler);
@@ -265,18 +283,6 @@ int main(int argc, char *argv[])
     }
     settings.importFromCommandLine(cmdutility);
     settings.applySettingsToLogger(cmdutility, appLogger);
-    VERBOSE() << "AntiMicroX version: " << PadderCommon::programVersion
-#ifdef ANTIMICROX_PKG_VERSION
-              << " Package: " << ANTIMICROX_PKG_VERSION
-#endif
-#ifdef QT_DEBUG
-              << " Type: Debug"
-#else
-              << " Type: Release"
-#endif
-        ;
-    VERBOSE() << "SDL version: " << PadderCommon::sdlVersionUsed << " (Compiled with: " << PadderCommon::sdlVersionCompiled
-              << ")";
 
     Q_INIT_RESOURCE(resources);
 
@@ -295,6 +301,7 @@ int main(int argc, char *argv[])
     // In the future, there might be a reason to actually send
     // messages to the QLocalServer.
     QLocalSocket socket;
+    log_system_config();
 
     if ((socket.serverName() == QString()))
     {