diff --git a/docs/changes.txt b/docs/changes.txt
index 6736992b2..2cba48c83 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -43,6 +43,7 @@
 
 - Association Attack: Enable module specific pw_min and pw_max settings to avoid false positives in -a 9 attack-mode
 - Autotune: Added error handling. By default skipping device on error, with --force using accel/loops/threads min values instead
+- Backend Info: Added generic system info to output (must be completed on Windows side)
 - Backend Info: Added local memory size to output
 - CUDA Backend: moved functions to ext_cuda.c/ext_nvrtc.c and includes to ext_cuda.h/ext_nvrtc.h
 - Hash Info: show more information (Updated Hash-Format. Added Autodetect, Self-Test, Potfile and Plaintext encoding)
diff --git a/src/terminal.c b/src/terminal.c
index 6c5c686b1..8504ba92d 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -807,7 +807,7 @@ void backend_info (hashcat_ctx_t *hashcat_ctx)
 
   #if defined (_WIN) || defined (__CYGWIN__) || defined (__MSYS__)
   // TODO
-  event_log_info (hashcat_ctx, "OS.Name......: N/A");
+  event_log_info (hashcat_ctx, "OS.Name......: Windows");
   event_log_info (hashcat_ctx, "OS.Release...: N/A");
   event_log_info (hashcat_ctx, "HW.Platform..: N/A");
   event_log_info (hashcat_ctx, "HW.Model.....: N/A");
@@ -849,7 +849,6 @@ void backend_info (hashcat_ctx_t *hashcat_ctx)
   event_log_info (hashcat_ctx, "OS.Release...: %s", (rc_uname  == true) ? utsbuf.release : "N/A");
   event_log_info (hashcat_ctx, "HW.Model.....: %s", (rc_sysctl == true) ? hw_model       : "N/A");
   event_log_info (hashcat_ctx, "HW.Platform..: %s", (rc_uname  == true) ? utsbuf.machine : "N/A");
-  event_log_info (hashcat_ctx, NULL);
 
   if (rc_sysctl == true)
   {
@@ -857,6 +856,8 @@ void backend_info (hashcat_ctx_t *hashcat_ctx)
   }
   #endif // _WIN || __CYGWIN__ || __MSYS__
 
+  event_log_info (hashcat_ctx, NULL);
+
   if (backend_ctx->cuda)
   {
     event_log_info (hashcat_ctx, "CUDA Info:");