diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index a25607d0e..15daa9f13 100644
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@@ -30529,6 +30529,15 @@ int main(int argc, char *argv[])
   freopen(stdout_win32, "w", stdout);   /* redirect stdout to a file */
   freopen(stderr_win32, "w", stderr);   /* redirect stderr to a file */
 #endif
+  printf("Tux Paint Version " VER_VERSION "");
+#ifdef WIN64
+  printf("- x86_64");
+#else
+  printf("- i686");
+#endif
+  printf(" (" VER_DATE ")\n");
+  printf("Running on ");
+  win32_print_version();
 #endif
 
 #ifdef DEBUG
@@ -30580,12 +30589,6 @@ int main(int argc, char *argv[])
   }
 #endif
 
-#ifdef WIN32
-  printf("Tux Paint Version " VER_VERSION " (" VER_DATE ")\n");
-  printf("Running on ");
-  win32_print_version();
-#endif
-  
   claim_to_be_ready();
 
   mainloop();
diff --git a/src/win32_version.c b/src/win32_version.c
index 064b2e6e8..152a68577 100644
--- a/src/win32_version.c
+++ b/src/win32_version.c
@@ -8,13 +8,13 @@ void win32_print_version(void);
 void win32_print_version(void)
 {
   char *verStr;
-  unsigned int Version = 0; 
+  unsigned int Version = 0;
   unsigned int Build = 0;
-  
+
   Version = GetVersion();
-  if (Version < 0x80000000)              
+  if (Version < 0x80000000)
     Build = (DWORD)(HIWORD(Version));
-      
+
   if (IsWindows10OrGreater()) {
     if (Build < 22000){
       verStr = strdup("Windows 10");
@@ -40,12 +40,12 @@ void win32_print_version(void)
   }
 
   printf ("Microsoft %s", verStr);
-  
+
   if (IsWindowsServer()){
     printf(" Server");
   }
-  
-  if (Version < 0x80000000){              
+
+  if (Version < 0x80000000){
     printf(" (Build %d)\n", Build);
   }
 }