diff --git a/Makefile.am b/Makefile.am
index 2edef0d..3f62cd9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,7 @@ if !ENABLE_LIBTLS_ONLY
 pkgconfig_DATA += libcrypto.pc libssl.pc openssl.pc
 endif
 
-EXTRA_DIST = README.md README.windows VERSION config scripts
+EXTRA_DIST = README.md README.mingw.md VERSION config scripts
 EXTRA_DIST += CMakeLists.txt cmake_export_symbol.cmake cmake_uninstall.cmake.in FindLibreSSL.cmake LibreSSLConfig.cmake.in
 EXTRA_DIST += cert.pem openssl.cnf x509v3.cnf
 
diff --git a/README.md b/README.md
index ab159ab..9c07175 100644
--- a/README.md
+++ b/README.md
@@ -134,7 +134,7 @@ make
 
 LibreSSL builds against relatively recent versions of Mingw-w64, not to be
 confused with the original mingw.org project. Mingw-w64 3.2 or later
-should work. See README.windows for more information
+should work. See README.mingw.md for more information.
 
 #### Windows - Visual Studio
 
diff --git a/README.windows b/README.mingw.md
similarity index 93%
rename from README.windows
rename to README.mingw.md
index 2d342fa..7c567bc 100644
--- a/README.windows
+++ b/README.mingw.md
@@ -1,4 +1,4 @@
-# Building
+## Building with mingw-w64 for 32- and 64-bit
 
 For Windows systems, LibreSSL supports the mingw-w64 toolchain, which can use
 GCC or Clang as the compiler. Contrary to its name, mingw-w64 supports both
@@ -23,7 +23,7 @@ For 64-bit builds, use these instead:
  make
  make check
 
-# Why the -D__MINGW_USE_VC2005_COMPAT flag on 32-bit systems?
+### Why the -D__MINGW_USE_VC2005_COMPAT flag on 32-bit systems?
 
 An ABI change introduced with Microsoft Visual C++ 2005 (also known as
 Visual C++ 8.0) switched time_t from 32-bit to 64-bit. It is important to
diff --git a/m4/check-os-options.m4 b/m4/check-os-options.m4
index 77edd14..3775b79 100644
--- a/m4/check-os-options.m4
+++ b/m4/check-os-options.m4
@@ -145,7 +145,7 @@ if test "$ac_cv_sizeof_time_t" = "4"; then
     if test "$host_os" = "mingw32" ; then
         echo " **"
         echo " ** You can solve this by adjusting the build flags in your"
-        echo " ** mingw-w64 toolchain. Refer to README.windows for details."
+        echo " ** mingw-w64 toolchain. Refer to README.mingw.md for details."
     fi
 fi