diff --git a/librttopo.spec b/librttopo.spec
index 83844d2..09c6ecc 100644
--- a/librttopo.spec
+++ b/librttopo.spec
@@ -1,18 +1,28 @@
 Name:           librttopo
 Version:        1.1.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Create and manage SQL/MM topologies
 
 License:        GPLv2+
 URL:            https://git.osgeo.org/gitea/rttopo/librttopo
 Source0:        https://git.osgeo.org/gitea/rttopo/librttopo/archive/%{name}-%{version}.tar.gz
+# Use pkgconfig to find geos
+Patch0:        librttopo_geos.patch
 
-BuildRequires:  autoconf
-BuildRequires:  automake
-BuildRequires:  gcc
-BuildRequires:  geos-devel
-BuildRequires:  libtool
-BuildRequires:  make
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: gcc
+BuildRequires: geos-devel
+BuildRequires: libtool
+BuildRequires: make
+
+BuildRequires: mingw32-filesystem >= 95
+BuildRequires: mingw32-gcc
+BuildRequires: mingw32-geos
+
+BuildRequires: mingw64-filesystem >= 95
+BuildRequires: mingw64-gcc
+BuildRequires: mingw64-geos
 
 
 %description
@@ -29,21 +39,55 @@ The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
 
+%package -n mingw32-%{name}
+Summary:       MinGW Windows Leptonica 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 -n %{name}
 
 
 %build
 autoreconf -ifv
+
+# Native build
+mkdir build_native
+pushd build_native
+%global _configure ../configure
 %configure --disable-static
 %make_build
+popd
+
+# MinGW build
+MINGW32_CONFIGURE_ARGS="PKGCONFIG=%{mingw32_target}-pkg-config" \
+MINGW64_CONFIGURE_ARGS="PKGCONFIG=%{mingw64_target}-pkg-config" \
+%mingw_configure  --disable-static
+%mingw_make_build
 
 
 %install
-%make_install
+%make_install -C build_native
+%mingw_make_install
+
 find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
 
+%mingw_debug_install_post
+
+
 %files
 %license COPYING
 %doc CREDITS NEWS.md README.md TODO
@@ -55,8 +99,26 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %{_libdir}/%{name}.so
 %{_libdir}/pkgconfig/rttopo.pc
 
+%files -n mingw32-%{name}
+%license COPYING
+%{mingw32_bindir}/%{name}-1.dll
+%{mingw32_includedir}/%{name}.h
+%{mingw32_includedir}/%{name}_geom.h
+%{mingw32_libdir}/%{name}.dll.a
+%{mingw32_libdir}/pkgconfig/rttopo.pc
+
+%files -n mingw64-%{name}
+%license COPYING
+%{mingw64_bindir}/%{name}-1.dll
+%{mingw64_includedir}/%{name}.h
+%{mingw64_includedir}/%{name}_geom.h
+%{mingw64_libdir}/%{name}.dll.a
+%{mingw64_libdir}/pkgconfig/rttopo.pc
 
 %changelog
+* Sun Feb 20 2022 Sandro Mani <manisandro@gmail.com> - 1.1.0-7
+- Add mingw subpackege
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild