diff --git a/autobuild.sh b/autobuild.sh
index 7261c21..4d2b116 100755
--- a/autobuild.sh
+++ b/autobuild.sh
@@ -20,15 +20,40 @@ make install
 rm -f *.tar.gz
 make dist
 
-if [ -f /usr/bin/rpmbuild ]; then
-  if [ -n "$AUTOBUILD_COUNTER" ]; then
-    EXTRA_RELEASE=".auto$AUTOBUILD_COUNTER"
-  else
-    NOW=`date +"%s"`
-    EXTRA_RELEASE=".$USER$NOW"
-  fi
-  rpmbuild --nodeps \
-    --define "extra_release $EXTRA_RELEASE" \
-    --define "with_plugin 1" \
-    -ta --clean *.tar.gz
+if [ -n "$AUTOBUILD_COUNTER" ]; then
+  EXTRA_RELEASE=".auto$AUTOBUILD_COUNTER"
+else
+  NOW=`date +"%s"`
+  EXTRA_RELEASE=".$USER$NOW"
+fi
+
+if [ -f /usr/bin/rpmbuild ]; then
+  rpmbuild --nodeps \
+     --define "extra_release $EXTRA_RELEASE" \
+     --define "_sourcedir `pwd`" \
+     -ba --clean virt-viewer.spec
+fi
+
+if [ -x /usr/bin/i686-pc-mingw32-gcc ]; then
+  make distclean
+
+  PKG_CONFIG_PATH="$AUTOBUILD_INSTALL_ROOT/i686-pc-mingw32/sys-root/mingw/lib/pkgconfig:/usr/i686-pc-mingw32/sys-root/mingw/lib/pkgconfig" \
+  CC="i686-pc-mingw32-gcc" \
+  ../configure \
+    --build=$(uname -m)-pc-linux \
+    --host=i686-pc-mingw32 \
+    --prefix="$AUTOBUILD_INSTALL_ROOT/i686-pc-mingw32/sys-root/mingw" \
+
+  make
+  make install
+
+  #set -o pipefail
+  #make check 2>&1 | tee "$RESULTS"
+
+  if [ -f /usr/bin/rpmbuild ]; then
+    rpmbuild --nodeps \
+       --define "extra_release $EXTRA_RELEASE" \
+       --define "_sourcedir `pwd`" \
+       -ba --clean mingw32-virt-viewer.spec
+  fi
 fi
diff --git a/configure.ac b/configure.ac
index 562726a..984a493 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,4 +54,5 @@ AC_OUTPUT(Makefile
           src/Makefile
           man/Makefile
 	  plugin/Makefile
-          virt-viewer.spec)
+          virt-viewer.spec
+          mingw32-virt-viewer.spec)
diff --git a/mingw32-virt-viewer.spec.in b/mingw32-virt-viewer.spec.in
new file mode 100644
index 0000000..2491149
--- /dev/null
+++ b/mingw32-virt-viewer.spec.in
@@ -0,0 +1,66 @@
+%define __strip %{_mingw32_strip}
+%define __objdump %{_mingw32_objdump}
+%define _use_internal_dependency_generator 0
+%define __find_requires %{_mingw32_findrequires}
+%define __find_provides %{_mingw32_findprovides}
+
+Name:           mingw32-virt-viewer
+Version:        @VERSION@
+Release:        1%{?dist}%{?extra_release}
+Summary:        MinGW Windows virt-viewer console application
+
+License:        LGPLv2+
+Group:          Development/Libraries
+URL:            http://virt-manager.org/
+Source0:        ftp://virt-manager.org/downloads/virt-viewer/virt-viewer-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  mingw32-filesystem >= 23
+BuildRequires:  mingw32-gtk2
+BuildRequires:  mingw32-libvirt-glib
+BuildRequires:  mingw32-libvirt >= 0.5.0
+BuildRequires:  mingw32-libxml2
+BuildRequires:  mingw32-libglade2
+BuildRequires:  pkgconfig
+
+BuildArch:      noarch
+
+
+%description
+MinGW Windows virt-viewer console application
+
+
+%prep
+%setup -q -n virt-viewer-%{version}
+
+
+%build
+%{_mingw32_configure}
+make
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+make DESTDIR=$RPM_BUILD_ROOT install
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root)
+%{_mingw32_bindir}/virt-viewer.exe
+
+%dir %{_mingw32_datadir}/virt-viewer/
+%dir %{_mingw32_datadir}/virt-viewer/ui/
+%{_mingw32_datadir}/virt-viewer/ui/about.glade
+%{_mingw32_datadir}/virt-viewer/ui/auth.glade
+%{_mingw32_datadir}/virt-viewer/ui/viewer.glade
+
+%{_mingw32_mandir}/man1/virt-viewer.1*
+
+%changelog
+* Fri Nov 28 2008 Daniel P. Berrange <berrange@redhat.com> - 0.0.4-1
+- Initial release
+
diff --git a/virt-viewer.spec.in b/virt-viewer.spec.in
index 2330169..868372b 100644
--- a/virt-viewer.spec.in
+++ b/virt-viewer.spec.in
@@ -18,6 +18,7 @@ Requires: openssh-clients
 BuildRequires: gtk2-devel
 BuildRequires: libvirt-devel
 BuildRequires: libxml2-devel
+BuildRequires: libglade2-devel
 BuildRequires: gtk-vnc-devel >= 0.3.4
 BuildRequires: /usr/bin/pod2man
 %if %{_with_plugin}