diff --git a/contrib/crossrpms/cygwin/libs.add b/contrib/crossrpms/cygwin/libs.add
new file mode 100644
index 0000000000..4a48414fcf
--- /dev/null
+++ b/contrib/crossrpms/cygwin/libs.add
@@ -0,0 +1,38 @@
+%define cygwin_version @CYGWIN_VERS@
+%define cygwin_rpmvers %{expand: %(echo @CYGWIN_VERS@ | tr - _)} 
+
+%define _use_internal_dependency_generator 0
+%define __debug_install_post %{nil}
+
+Name:         @rpmprefix@@tool_target@
+Release:      @CYGWIN_RPMREL@%{?dist}
+License:      GPL
+Group:        Development/Tools
+
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:	noarch
+
+Version:      	%cygwin_rpmvers
+Summary:      	@tool_target@ libraries
+
+Source0:	ftp://cygwin.com/pub/cygwin/release/cygwin/cygwin-%{cygwin_version}.tar.bz2
+%{?!_with_sources:NoSource:	0}
+
+%description
+@tool_target@ libraries.
+
+%prep
+%setup -c -q
+
+%build
+  rm -rf @tool_target@
+
+  # Setup sys-root (Usable for gcc >= 3.4)
+  mkdir -p @tool_target@/sys-root
+  tar cf - lib usr/lib usr/include | ( cd @tool_target@/sys-root ; tar xf -)
+
+%install
+  rm -rf $RPM_BUILD_ROOT
+  mkdir -p $RPM_BUILD_ROOT%{_prefix}
+  cp -a @tool_target@ $RPM_BUILD_ROOT%{_prefix}
+
diff --git a/contrib/crossrpms/cygwin/target-libs.add b/contrib/crossrpms/cygwin/target-libs.add
new file mode 100644
index 0000000000..0550fc7c07
--- /dev/null
+++ b/contrib/crossrpms/cygwin/target-libs.add
@@ -0,0 +1,11 @@
+%package sys-root
+Group: Development/Tools
+Summary: @tool_target@ target files for gcc >= 3.4
+
+%description sys-root
+@tool_target@ target files for gcc >= 3.4
+
+%files sys-root
+%defattr(-,root,root,-)
+%dir %{_prefix}/@tool_target@
+%{_prefix}/@tool_target@/sys-root