diff --git a/.bzrignore b/.bzrignore
index c3e8b03d4..e2b4b042d 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -7,3 +7,4 @@ debian/*.substvars
 debian/stratagus
 debian/stratagus-dbg
 debian/stratagus-doc
+doc/doxygen
diff --git a/debian/control b/debian/control
index 8c6e35f06..2d201e1ed 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: stratagus
 Section: games
 Priority: optional
 Maintainer: Pali Rohár <pali.rohar@gmail.com>
-Build-Depends: debhelper (>> 5), cdbs, cmake (>= 2.6),
- imagemagick, sharutils, liblua5.1-dev | liblua5.1-0-dev, libtolua++5.1-dev
+Build-Depends: debhelper (>> 5), cdbs, cmake (>= 2.6), doxygen,
+ imagemagick, sharutils, liblua5.1-dev | liblua5.1-0-dev, libtolua++5.1-dev,
  zlib1g-dev, libbz2-dev, libpng12-dev (>= 1.2.5), libmng-dev,
  libmikmod2-dev, libogg-dev, libvorbis-dev, libtheora-dev,
  libsdl1.2-dev (>> 1.2.2), libosso-dev, libx11-dev, libsqlite3-dev,
diff --git a/debian/rules b/debian/rules
index b3bd58494..aafd5313e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 #
 #    debian/rules
-#    Copyright (C) 2010  Pali Rohár <pali.rohar@gmail.com>
+#    Copyright (C) 2010-2011  Pali Rohár <pali.rohar@gmail.com>
 #
 #    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
@@ -29,13 +29,13 @@ clean::
 build:
 	mkdir -p $(CURDIR)/build $(CURDIR)/build-dbg
 	cd $(CURDIR)/build && cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ..
-	cd $(CURDIR)/build-dbg && cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Debug ..
+	cd $(CURDIR)/build-dbg && cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Debug -DENABLE_DOC=OFF ..
 	$(MAKE) -C $(CURDIR)/build
 	$(MAKE) -C $(CURDIR)/build-dbg
 
 install/stratagus::
 	install -m0755 $(CURDIR)/build/stratagus $(CURDIR)/debian/stratagus/usr/games/
-	convert $(CURDIR)/contrib/stratagus.ico $(CURDIR)/debian/stratagus/usr/share/pixmaps/stratagus.png
+	convert $(CURDIR)/src/win32/stratagus.ico $(CURDIR)/debian/stratagus/usr/share/pixmaps/stratagus.png
 
 install/stratagus-dbg::
 	install -m0755 $(CURDIR)/build-dbg/stratagus $(CURDIR)/debian/stratagus-dbg/usr/games/stratagus-dbg
@@ -61,7 +61,7 @@ binary-predeb/stratagus::
 		echo "XSBC-Bugtracker: https://bugs.launchpad.net/stratagus" >> $(CURDIR)/debian/control; \
 		echo "XB-Maemo-Display-Name: Stratagus" >> $(CURDIR)/debian/control; \
 		echo "XB-Maemo-Icon-26:" >> $(CURDIR)/debian/control; \
-		for line in $(shell convert $(CURDIR)/contrib/stratagus.ico -resize 48x48 png:- | uuencode -m - | tail -n +2 | head -n -1); do \
+		for line in $(shell convert $(CURDIR)/src/win32/stratagus.ico -resize 48x48 png:- | uuencode -m - | tail -n +2 | head -n -1); do \
 			echo " $$line" >> $(CURDIR)/debian/control; \
 		done; \
 		sed -n -e "/^Depends:.*$$/,\$$p" $(CURDIR)/debian/control.orig | tail -n +2 >> $(CURDIR)/debian/control; \
diff --git a/debian/stratagus-doc.doc.base b/debian/stratagus-doc.doc.base
index 4e98800dc..6fa8524bb 100644
--- a/debian/stratagus-doc.doc.base
+++ b/debian/stratagus-doc.doc.base
@@ -7,6 +7,6 @@ Abstract: This manual describes what Stratagus is
 Section: games
 
 Format: HTML
-Index: /usr/share/doc/stratagus/doc/index.html
-Files: /usr/share/doc/stratagus/doc/*.html
+Index: /usr/share/doc/stratagus-doc/index.html
+Files: /usr/share/doc/stratagus-doc/*.html
 
diff --git a/debian/stratagus-doc.docs b/debian/stratagus-doc.docs
index bc6d5adf7..24ecdc519 100644
--- a/debian/stratagus-doc.docs
+++ b/debian/stratagus-doc.docs
@@ -1,2 +1,3 @@
-README
-doc/
+doc/*.html
+doc/*.txt
+doc/doxygen