diff --git a/uriparser-inet-ntop.patch b/uriparser-inet-ntop.patch
new file mode 100644
index 0000000..d298963
--- /dev/null
+++ b/uriparser-inet-ntop.patch
@@ -0,0 +1,14 @@
+diff -rupN --no-dereference uriparser-0.9.6/tool/uriparse.c uriparser-0.9.6-new/tool/uriparse.c
+--- uriparser-0.9.6/tool/uriparse.c	2022-01-06 19:01:11.000000000 +0100
++++ uriparser-0.9.6-new/tool/uriparse.c	2022-01-07 10:22:25.506474914 +0100
+@@ -43,10 +43,6 @@
+ #ifdef _WIN32
+ # include <winsock2.h>
+ # include <ws2tcpip.h>
+-# ifdef __MINGW32__
+-WINSOCK_API_LINKAGE const char * WSAAPI inet_ntop(
+-		int af, const void *src, char *dst, socklen_t size);
+-# endif
+ #else
+ # include <sys/socket.h>
+ # include <arpa/inet.h>
diff --git a/uriparser.spec b/uriparser.spec
index 59d5e46..b3eed53 100644
--- a/uriparser.spec
+++ b/uriparser.spec
@@ -1,13 +1,13 @@
-%undefine __cmake_in_source_build
-
 Name:           uriparser
 Version:        0.9.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        URI parsing library - RFC 3986
 
 License:        BSD
 URL:            https://uriparser.github.io/
 Source0:        https://github.com/%{name}/%{name}/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2
+# Don't add separate conflicting declaration for inet_ntop
+Patch0:         uriparser-inet-ntop.patch
 
 BuildRequires:  cmake
 BuildRequires:  doxygen
@@ -16,6 +16,13 @@ BuildRequires:  graphviz
 BuildRequires:  gtest-devel
 BuildRequires:  make
 
+BuildRequires:  mingw32-filesystem >= 95
+BuildRequires:  mingw32-gcc-c++
+
+BuildRequires:  mingw64-filesystem >= 95
+BuildRequires:  mingw64-gcc-c++
+
+
 %description
 Uriparser is a strictly RFC 3986 compliant URI parsing library written
 in C. uriparser is cross-platform, fast, supports Unicode and is
@@ -39,6 +46,24 @@ BuildArch:      noarch
 The %{name}-doc package contains HTML documentation files for %{name}.
 
 
+%package -n mingw32-%{name}
+Summary:        MinGW Windows %{name} library
+
+%description -n mingw32-%{name}
+MinGW Windows %{name} library.
+
+
+%package -n mingw64-%{name}
+Summary:        MinGW Windows %{name} library
+
+%description -n mingw64-%{name}
+MinGW Windows %{name} library.
+
+
+%{?mingw_debug_package}
+
+
+
 %prep
 %autosetup -p1
 
@@ -47,12 +72,21 @@ sed -i 's/GENERATE_QHP\ =\ yes/GENERATE_QHP\ =\ no/g' doc/Doxyfile.in
 
 
 %build
+# Native build
 %cmake
 %cmake_build
 
+# MinGW build
+%mingw_cmake -DURIPARSER_BUILD_TESTS=OFF -DURIPARSER_BUILD_DOCS=OFF
+%mingw_make_build
+
 
 %install
 %cmake_install
+%mingw_make_install
+
+
+%mingw_debug_install_post
 
 
 %check
@@ -75,8 +109,29 @@ sed -i 's/GENERATE_QHP\ =\ yes/GENERATE_QHP\ =\ no/g' doc/Doxyfile.in
 %license COPYING
 %doc %{_docdir}/%{name}/html
 
+%files -n mingw32-%{name}
+%license COPYING
+%{mingw32_bindir}/uriparse.exe
+%{mingw32_bindir}/lib%{name}-1.dll
+%{mingw32_includedir}/%{name}/
+%{mingw32_libdir}/lib%{name}.dll.a
+%{mingw32_libdir}/pkgconfig/lib%{name}.pc
+%{mingw32_libdir}/cmake/%{name}-%{version}/
+
+%files -n mingw64-%{name}
+%license COPYING
+%{mingw64_bindir}/uriparse.exe
+%{mingw64_includedir}/%{name}/
+%{mingw64_bindir}/lib%{name}-1.dll
+%{mingw64_libdir}/lib%{name}.dll.a
+%{mingw64_libdir}/pkgconfig/lib%{name}.pc
+%{mingw64_libdir}/cmake/%{name}-%{version}/
+
 
 %changelog
+* Thu Feb 24 2022 Sandro Mani <manisandro@gmail.com> - 0.9.6-1
+- Add mingw subpackages
+
 * Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild