diff -Nru ebox-dhcp-2.0.5/ChangeLog ebox-dhcp-2.0.6/ChangeLog
--- ebox-dhcp-2.0.5/ChangeLog	2011-05-07 10:59:21.000000000 +0000
+++ ebox-dhcp-2.0.6/ChangeLog	2011-05-10 08:07:18.000000000 +0000
@@ -1,3 +1,5 @@
+2.0.6
+	+ Apparmor profile now works without DNS module installed
 2.0.5
 	+ Write standard dhcpd apparmor profile when setting the
 	  configuration and migration to remove old apparmor profile to
@@ -6,6 +8,7 @@
 	+ Fixed 'routers' option when gateway is set to 'none'
 	+ Object members without a valid hostname are no longer used as
 	  fixed addresses
+	+ Migrations do not crash if dns is not installed
 2.0.4
 	+ Bugfix: dhcp module never fail to save changes when a change
 	  in network interface is done
diff -Nru ebox-dhcp-2.0.5/configure ebox-dhcp-2.0.6/configure
--- ebox-dhcp-2.0.5/configure	2011-05-07 11:00:01.000000000 +0000
+++ ebox-dhcp-2.0.6/configure	2011-05-10 08:07:32.000000000 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for EBox-DHCP 2.0.5.
+# Generated by GNU Autoconf 2.67 for EBox-DHCP 2.0.6.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -548,8 +548,8 @@
 # Identity of this package.
 PACKAGE_NAME='EBox-DHCP'
 PACKAGE_TARNAME='ebox-dhcp'
-PACKAGE_VERSION='2.0.5'
-PACKAGE_STRING='EBox-DHCP 2.0.5'
+PACKAGE_VERSION='2.0.6'
+PACKAGE_STRING='EBox-DHCP 2.0.6'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1208,7 +1208,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures EBox-DHCP 2.0.5 to adapt to many kinds of systems.
+\`configure' configures EBox-DHCP 2.0.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1274,7 +1274,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of EBox-DHCP 2.0.5:";;
+     short | recursive ) echo "Configuration of EBox-DHCP 2.0.6:";;
    esac
   cat <<\_ACEOF
 
@@ -1357,7 +1357,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-EBox-DHCP configure 2.0.5
+EBox-DHCP configure 2.0.6
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1374,7 +1374,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by EBox-DHCP $as_me 2.0.5, which was
+It was created by EBox-DHCP $as_me 2.0.6, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -2192,7 +2192,7 @@
 
 # Define the identity of the package.
  PACKAGE='ebox-dhcp'
- VERSION='2.0.5'
+ VERSION='2.0.6'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3622,7 +3622,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by EBox-DHCP $as_me 2.0.5, which was
+This file was extended by EBox-DHCP $as_me 2.0.6, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -3679,7 +3679,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-EBox-DHCP config.status 2.0.5
+EBox-DHCP config.status 2.0.6
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
diff -Nru ebox-dhcp-2.0.5/configure.ac ebox-dhcp-2.0.6/configure.ac
--- ebox-dhcp-2.0.5/configure.ac	2011-05-07 10:59:21.000000000 +0000
+++ ebox-dhcp-2.0.6/configure.ac	2011-05-10 08:07:18.000000000 +0000
@@ -1,4 +1,4 @@
-AC_INIT([EBox-DHCP], [2.0.5])
+AC_INIT([EBox-DHCP], [2.0.6])
 
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_SRCDIR([src/EBox/DHCP.pm.in])
diff -Nru ebox-dhcp-2.0.5/debian/changelog ebox-dhcp-2.0.6/debian/changelog
--- ebox-dhcp-2.0.5/debian/changelog	2011-05-10 08:12:28.000000000 +0000
+++ ebox-dhcp-2.0.6/debian/changelog	2011-05-10 08:12:28.000000000 +0000
@@ -1,8 +1,14 @@
+ebox-dhcp (2.0.6) lucid; urgency=low
+
+  * New upstream release
+
+ -- José A. Calvo <jacalvo@zentyal.com>  Tue, 10 May 2011 10:07:38 +0200
+
 ebox-dhcp (2.0.5) lucid; urgency=low
 
   * New upstream release
 
- -- José A. Calvo <jacalvo@zentyal.com>  Sat, 07 May 2011 13:00:15 +0200
+ -- José A. Calvo <jacalvo@zentyal.com>  Sat, 07 May 2011 13:55:11 +0200
 
 ebox-dhcp (2.0.4) lucid; urgency=low
 
diff -Nru ebox-dhcp-2.0.5/migration/0004_dyn_domains.pl ebox-dhcp-2.0.6/migration/0004_dyn_domains.pl
--- ebox-dhcp-2.0.5/migration/0004_dyn_domains.pl	2011-03-13 10:16:15.000000000 +0000
+++ ebox-dhcp-2.0.6/migration/0004_dyn_domains.pl	2011-05-07 11:54:38.000000000 +0000
@@ -24,6 +24,7 @@
 
 use EBox;
 use EBox::Global;
+use Error qw(:try);
 
 # Private methods
 
@@ -46,18 +47,19 @@
 {
     my ($self) = @_;
 
-    my $dhcpMod = $self->{gconfmodule};
-    my $dnsMod  = EBox::Global->modInstance('dns');
-    my $domainModel = $dnsMod->model('DomainTable');
-
-    $dhcpMod->models();
-    foreach my $iface (keys %{$dhcpMod->{dynamicDNSModel}}) {
-        my $model = $dhcpMod->{dynamicDNSModel}->{$iface};
-        my $key = $model->{directory};
-        $self->_setDomainId($dhcpMod, $domainModel, "$key/dynamic_domain");
-        $self->_setDomainId($dhcpMod, $domainModel, "$key/custom");
-    }
-
+    try {
+        my $dhcpMod = $self->{gconfmodule};
+        my $dnsMod  = EBox::Global->modInstance('dns');
+        my $domainModel = $dnsMod->model('DomainTable');
+
+        $dhcpMod->models();
+        foreach my $iface (keys %{$dhcpMod->{dynamicDNSModel}}) {
+            my $model = $dhcpMod->{dynamicDNSModel}->{$iface};
+            my $key = $model->{directory};
+            $self->_setDomainId($dhcpMod, $domainModel, "$key/dynamic_domain");
+            $self->_setDomainId($dhcpMod, $domainModel, "$key/custom");
+        }
+    } otherwise {};
 }
 
 EBox::init();
diff -Nru ebox-dhcp-2.0.5/migration/0005_upgrade_apparmor_profile.pl ebox-dhcp-2.0.6/migration/0005_upgrade_apparmor_profile.pl
--- ebox-dhcp-2.0.5/migration/0005_upgrade_apparmor_profile.pl	2011-03-13 10:16:15.000000000 +0000
+++ ebox-dhcp-2.0.6/migration/0005_upgrade_apparmor_profile.pl	2011-05-07 11:54:38.000000000 +0000
@@ -25,6 +25,7 @@
 use EBox;
 use EBox::Global;
 use EBox::Sudo;
+use Error qw(:try);
 
 use constant APPARMOR_PROFILE => '/etc/apparmor.d/usr.sbin.dhcpd3.zentyal';
 use constant APPARMOR_SERVICE => '/etc/init.d/apparmor';
@@ -35,13 +36,15 @@
 
     my $dhcpMod = $self->{gconfmodule};
 
-    if ( $dhcpMod->isEnabled() ) {
-        $dhcpMod->writeConfFile(APPARMOR_PROFILE, 'dhcp/apparmor-dhcpd.profile.mas',
-                                [ ( 'keysFile' => $dhcpMod->_keysFile(),
-                                    'confDir'  => $dhcpMod->IncludeDir() ) ]);
-        EBox::Sudo::root(APPARMOR_SERVICE . ' restart');
-    }
+    try {
 
+        if ($dhcpMod->isEnabled()) {
+            $dhcpMod->writeConfFile(APPARMOR_PROFILE, 'dhcp/apparmor-dhcpd.profile.mas',
+                                    [ ( 'keysFile' => $dhcpMod->_keysFile(),
+                                        'confDir'  => $dhcpMod->IncludeDir() ) ]);
+            EBox::Sudo::root(APPARMOR_SERVICE . ' restart');
+        }
+    } otherwise {};
 }
 
 EBox::init();
diff -Nru ebox-dhcp-2.0.5/stubs/apparmor-dhcpd.profile.mas ebox-dhcp-2.0.6/stubs/apparmor-dhcpd.profile.mas
--- ebox-dhcp-2.0.5/stubs/apparmor-dhcpd.profile.mas	2011-03-13 10:16:15.000000000 +0000
+++ ebox-dhcp-2.0.6/stubs/apparmor-dhcpd.profile.mas	2011-05-10 07:59:17.000000000 +0000
@@ -52,8 +52,10 @@
   /var/run/eucalyptus/net/*.leases* lrw,
   /var/run/eucalyptus/net/*.trace lrw,
 
+% if ($keysFile) {
   # For dynamic DNS (Zentyal)
   <% $keysFile %> r,
+% }
   
   # For allowing custom tweaking (Zentyal)
   <% $confDir %>* r,