diff --git a/build.bat b/build.bat
new file mode 100644
index 0000000..ba89a61
--- /dev/null
+++ b/build.bat
@@ -0,0 +1,20 @@
+:: Build patool
+:: Copyright (C) 2012 Bastian Kleineidam
+:: This program is free software; you can redistribute it and/or modify
+:: it under the terms of the GNU General Public License as published by
+:: the Free Software Foundation; either version 2 of the License, or
+:: (at your option) any later version.
+::
+:: This program is distributed in the hope that it will be useful,
+:: but WITHOUT ANY WARRANTY; without even the implied warranty of
+:: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+:: GNU General Public License for more details.
+::
+:: You should have received a copy of the GNU General Public License along
+:: with this program; if not, write to the Free Software Foundation, Inc.,
+:: 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+@echo off
+:: Python version
+set PYDIR=C:\Python27
+set PYVER=2.7
+%PYDIR%\python.exe setup.py build
diff --git a/dist.bat b/dist.bat
old mode 100755
new mode 100644
index 89be72b..518703e
--- a/dist.bat
+++ b/dist.bat
@@ -1,5 +1,5 @@
 :: Create patool Windows distribution file
-:: Copyright (C) 2010 Bastian Kleineidam
+:: Copyright (C) 2010-2012 Bastian Kleineidam
 :: This program is free software: you can redistribute it and/or modify
 :: it under the terms of the GNU General Public License as published by
 :: the Free Software Foundation, either version 3 of the License, or
@@ -14,7 +14,8 @@
 :: along with this program.  If not, see <http://www.gnu.org/licenses/>.
 @echo off
 set PYDIR=c:\python27
-rd build /s /q
-rd dist /s /q
-%PYDIR%\python.exe setup.py bdist_wininst
+rd /s /q build > nul
+call %~dp0\build.bat
+rd /s /q dist > nul
+%PYDIR%\python.exe setup.py py2exe
 pause
diff --git a/doc/icon/Makefile b/doc/icon/Makefile
new file mode 100644
index 0000000..16898b1
--- /dev/null
+++ b/doc/icon/Makefile
@@ -0,0 +1,10 @@
+OXYGEN := ${HOME}/src/oxygen-gitsvn
+ICOICONS := logo16x16.png logo32x32.png
+
+all:	favicon.ico
+
+logo%.png:	$(OXYGEN)/%/apps/utilities-file-archiver.png
+	cp $< $@
+
+favicon.ico:	$(ICOICONS)
+	png2ico favicon.ico $(ICOICONS)
diff --git a/doc/icon/favicon.ico b/doc/icon/favicon.ico
new file mode 100644
index 0000000..9f755b3
Binary files /dev/null and b/doc/icon/favicon.ico differ
diff --git a/doc/icon/logo16x16.png b/doc/icon/logo16x16.png
new file mode 100644
index 0000000..7e5d49a
Binary files /dev/null and b/doc/icon/logo16x16.png differ
diff --git a/doc/icon/logo32x32.png b/doc/icon/logo32x32.png
new file mode 100644
index 0000000..81700b8
Binary files /dev/null and b/doc/icon/logo32x32.png differ