diff -Nru carmen-0.7.4-beta/debian/carmen-doc.install carmen-0.7.4-beta/debian/carmen-doc.install
--- carmen-0.7.4-beta/debian/carmen-doc.install	1970-01-01 01:00:00.000000000 +0100
+++ carmen-0.7.4-beta/debian/carmen-doc.install	2010-08-08 11:32:35.000000000 +0100
@@ -0,0 +1 @@
+doc/html/*	usr/share/doc/carmen
diff -Nru carmen-0.7.4-beta/debian/changelog carmen-0.7.4-beta/debian/changelog
--- carmen-0.7.4-beta/debian/changelog	2010-08-07 13:42:35.000000000 +0100
+++ carmen-0.7.4-beta/debian/changelog	2010-08-08 11:56:41.000000000 +0100
@@ -1,4 +1,4 @@
-carmen (0.7.4-beta-0robobuntu1~ppa3) maverick; urgency=low
+carmen (0.7.4-beta-0robobuntu1~maverick1) maverick; urgency=low
 
   * Initial release.
 
diff -Nru carmen-0.7.4-beta/debian/control carmen-0.7.4-beta/debian/control
--- carmen-0.7.4-beta/debian/control	2010-08-07 10:48:51.000000000 +0100
+++ carmen-0.7.4-beta/debian/control	2010-08-08 11:52:17.000000000 +0100
@@ -2,7 +2,17 @@
 Section: misc
 Priority: optional
 Maintainer: Andrea Colangelo <warp10@ubuntu.com>
-Build-Depends: debhelper (>= 7.0.50~), linux-headers-generic, libgtk2.0-dev, libwrap0-dev, libjpeg62-dev, libmagickwand-dev, doxygen, swig
+Build-Depends:
+ debhelper (>= 7.0.50~),
+ linux-headers-generic,
+ libgtk2.0-dev,
+ libwrap0-dev,
+ libjpeg62-dev,
+ libmagickwand-dev,
+ doxygen,
+ swig,
+ texlive-latex-base,
+ ghostscript
 Standards-Version: 3.9.0
 Homepage: http://carmen.sourceforge.net/
 
@@ -29,23 +39,23 @@
  including: base and sensor control, logging, obstacle avoidance,
  localization, path planning, and mapping.
 
-#Package: carmen-doc
-#Section: doc
-#Architecture: all
-#Depends: ${misc:Depends}
-#Suggests: carmen, carmen-data
-#Description: Documentation for CARMEN
-# This package provides some documentation for CARMEN.
-# .
-# CARMEN is an open-source collection of software for mobile robot control.
-# It is modular software designed to provide basic navigation primatives
-# including: base and sensor control, logging, obstacle avoidance,
-# localization, path planning, and mapping. 
+Package: carmen-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Suggests: carmen, carmen-data
+Description: Documentation for CARMEN
+ This package provides some documentation for CARMEN.
+ .
+ CARMEN is an open-source collection of software for mobile robot control.
+ It is modular software designed to provide basic navigation primatives
+ including: base and sensor control, logging, obstacle avoidance,
+ localization, path planning, and mapping. 
 
 Package: carmen-dev
 Section: devel
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Architecture: all
+Depends: ${misc:Depends}
 Suggests: carmen, carmen-data, carmen-doc
 Description: Header for CARMEN
  This package contains headers for CARMEN.
diff -Nru carmen-0.7.4-beta/debian/patches/doc.patch carmen-0.7.4-beta/debian/patches/doc.patch
--- carmen-0.7.4-beta/debian/patches/doc.patch	1970-01-01 01:00:00.000000000 +0100
+++ carmen-0.7.4-beta/debian/patches/doc.patch	2010-08-08 10:59:09.000000000 +0100
@@ -0,0 +1,22 @@
+Index: carmen-0.7.4-beta/src/Makefile.conf
+===================================================================
+--- carmen-0.7.4-beta.orig/src/Makefile.conf	2010-08-08 11:55:59.993169856 +0200
++++ carmen-0.7.4-beta/src/Makefile.conf	2010-08-08 11:59:06.496370403 +0200
+@@ -20,12 +20,17 @@
+   else
+   ifeq (../../../Makefile.vars, $(wildcard ../../../Makefile.vars))
+     include ../../../Makefile.vars
++  #This path is needed to compile stuff in doc/
++  else
++  ifeq (../src/Makefile.vars, $(wildcard ../src/Makefile.vars))
++    include ../src/Makefile.vars
+   else
+     $(error You need to run 'configure' first)
+   endif
+   endif
+   endif
+   endif
++  endif
+ endif
+ 
+ ifndef CC
diff -Nru carmen-0.7.4-beta/debian/patches/series carmen-0.7.4-beta/debian/patches/series
--- carmen-0.7.4-beta/debian/patches/series	2010-08-06 16:17:54.000000000 +0100
+++ carmen-0.7.4-beta/debian/patches/series	2010-08-08 10:55:53.000000000 +0100
@@ -2,3 +2,4 @@
 missing_carmen-config.c.patch
 FTBFS.patch
 install_path.patch
+doc.patch
diff -Nru carmen-0.7.4-beta/debian/rules carmen-0.7.4-beta/debian/rules
--- carmen-0.7.4-beta/debian/rules	2010-08-07 13:42:26.000000000 +0100
+++ carmen-0.7.4-beta/debian/rules	2010-08-08 11:39:58.000000000 +0100
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-export DH_VERBOSE=1
+#export DH_VERBOSE=1
 export DH_OPTIONS
 
 %:
@@ -8,7 +8,11 @@
 
 
 override_dh_auto_configure:
-	dh_auto_configure -- --prefix=/usr/ --nojava --nopython --headers=/usr/src/linux-headers-2.6.35-7-generic/include
+	dh_auto_configure -- --prefix=/usr/ --headers=/usr/src/linux-headers-2.6.35-7-generic/include --nojava --nopython
+
+override_dh_auto_build:
+	dh_auto_build
+	$(MAKE) -C doc/
 
 override_dh_install:
 	dh_install