diff --git a/installers/pom.xml b/installers/pom.xml
index b199271..6096ce5 100644
--- a/installers/pom.xml
+++ b/installers/pom.xml
@@ -13,7 +13,7 @@
     <dependency>
       <groupId>org.apache.directory.daemon</groupId>
       <artifactId>daemon-bootstrappers</artifactId>
-      <version>1.0-RC2-SNAPSHOT</version>
+      <version>1.1.0</version>
     </dependency>  
 
     <dependency>
@@ -65,7 +65,7 @@
       <plugin>
         <groupId>org.apache.directory.daemon</groupId>
         <artifactId>daemon-plugin</artifactId>
-        <version>1.0-RC2-SNAPSHOT</version>
+        <version>1.1.0</version>
         <configuration>
           <excludes>
             <exclude>ant:ant</exclude>
diff --git a/installers/src/main/installers/config.properties b/installers/src/main/installers/config.properties
index ac413dc..04f1a4b 100644
--- a/installers/src/main/installers/config.properties
+++ b/installers/src/main/installers/config.properties
@@ -1,18 +1,39 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 #
 # Framework config properties.
 #
-org.osgi.framework.system.packages=org.osgi.framework; version=1.3.0, \
+org.osgi.framework.system.packages=\
+ org.osgi.framework; version=1.3.0, \
  org.osgi.service.packageadmin; version=1.2.0, \
  org.osgi.service.startlevel; version=1.0.0, \
  org.osgi.service.url; version=1.0.0, \
+ org.osgi.util.tracker; version=1.3.2 \
  ${jre-${java.specification.version}}
+
 #org.osgi.framework.bootdelegation=sun.*,com.sun.*
 felix.auto.start.1= \
- file:%INSTALL_PATH/bundle/org.apache.felix.shell-${pom.version}.jar \
- file:%INSTALL_PATH/bundle/org.apache.felix.shell.tui-${pom.version}.jar \
- file:%INSTALL_PATH/bundle/org.apache.felix.bundlerepository-${pom.version}.jar 
+  "file:${felix.home}/bundle/org.apache.felix.shell-${pom.version}.jar" \
+  "file:${felix.home}/bundle/org.apache.felix.shell.tui-${pom.version}.jar" \
+  "file:${felix.home}/bundle/org.apache.felix.bundlerepository-${pom.version}.jar" 
 felix.startlevel.framework=1
 felix.startlevel.bundle=1
+felix.cache.profiledir=${felix.home}/var/cache
 #framework.service.urlhandlers=false
 
 #
@@ -26,7 +47,7 @@
 #
 # Java platform package export properties.
 #
-jre-1.3= \
+jre-1.3=, \
  javax.accessibility; \
  javax.accessibility.resources; \
  javax.naming; \
@@ -72,7 +93,7 @@
  org.omg.stub.java.rmi; \
  version="1.3.0"
 
-jre-1.4= \
+jre-1.4=, \
  javax.accessibility; \
  javax.imageio; \
  javax.imageio.event; \
@@ -85,6 +106,8 @@
  javax.naming.event; \
  javax.naming.ldap; \
  javax.naming.spi; \
+ javax.net; \
+ javax.net.ssl; \
  javax.print; \
  javax.print.attribute; \
  javax.print.attribute.standard; \
@@ -200,7 +223,7 @@
  org.xml.sax.helpers; \
  version="1.4.0"
 
-jre-1.5= \
+jre-1.5=, \
  javax.accessibility; \
  javax.activity; \
  javax.imageio; \
@@ -224,6 +247,8 @@
  javax.naming.event; \
  javax.naming.ldap; \
  javax.naming.spi; \
+ javax.net; \
+ javax.net.ssl; \
  javax.print; \
  javax.print.attribute; \
  javax.print.attribute.standard; \
@@ -319,3 +344,216 @@
  org.xml.sax.ext; \
  org.xml.sax.helpers; \
  version="1.5.0"
+jre-1.6=, \
+ java.applet; \
+ java.awt; \
+ java.awt.color; \
+ java.awt.datatransfer; \
+ java.awt.dnd; \
+ java.awt.dnd.peer; \
+ java.awt.event; \
+ java.awt.font; \
+ java.awt.geom; \
+ java.awt.im; \
+ java.awt.image; \
+ java.awt.image.renderable; \
+ java.awt.im.spi; \
+ java.awt.peer; \
+ java.awt.print; \
+ java.beans; \
+ java.beans.beancontext; \
+ java.io; \
+ java.lang; \
+ java.lang.annotation; \
+ java.lang.instrument; \
+ java.lang.management; \
+ java.lang.ref; \
+ java.lang.reflect; \
+ java.math; \
+ java.net; \
+ java.nio; \
+ java.nio.channels; \
+ java.nio.channels.spi; \
+ java.nio.charset; \
+ java.nio.charset.spi; \
+ java.rmi; \
+ java.rmi.activation; \
+ java.rmi.dgc; \
+ java.rmi.registry; \
+ java.rmi.server; \
+ java.security; \
+ java.security.acl; \
+ java.security.cert; \
+ java.security.interfaces; \
+ java.security.spec; \
+ java.sql; \
+ java.text; \
+ java.text.spi; \
+ java.util; \
+ java.util.concurrent; \
+ java.util.concurrent.atomic; \
+ java.util.concurrent.locks; \
+ java.util.jar; \
+ java.util.logging; \
+ java.util.prefs; \
+ java.util.regex; \
+ java.util.spi; \
+ java.util.zip; \
+ javax.accessibility; \
+ javax.activation; \
+ javax.activity; \
+ javax.annotation; \
+ javax.annotation.processing; \
+ javax.imageio; \
+ javax.imageio.event; \
+ javax.imageio.metadata; \
+ javax.imageio.plugins.bmp; \
+ javax.imageio.plugins.jpeg; \
+ javax.imageio.spi; \
+ javax.imageio.stream; \
+ javax.jws; \
+ javax.jws.soap; \
+ javax.lang.model; \
+ javax.lang.model.element; \
+ javax.lang.model.type; \
+ javax.lang.model.util; \
+ javax.management; \
+ javax.management.loading; \
+ javax.management.modelmbean; \
+ javax.management.monitor; \
+ javax.management.openmbean; \
+ javax.management.relation; \
+ javax.management.remote; \
+ javax.management.remote.rmi; \
+ javax.management.timer; \
+ javax.naming; \
+ javax.naming.directory; \
+ javax.naming.event; \
+ javax.naming.ldap; \
+ javax.naming.spi; \
+ javax.net; \
+ javax.net.ssl; \
+ javax.print; \
+ javax.print.attribute; \
+ javax.print.attribute.standard; \
+ javax.print.event; \
+ javax.rmi; \
+ javax.rmi.CORBA; \
+ javax.rmi.ssl; \
+ javax.script; \
+ javax.security.auth; \
+ javax.security.auth.callback; \
+ javax.security.auth.kerberos; \
+ javax.security.auth.login; \
+ javax.security.auth.spi; \
+ javax.security.auth.x500; \
+ javax.security.sasl; \
+ javax.smartcardio; \
+ javax.sound.midi; \
+ javax.sound.midi.spi; \
+ javax.sound.sampled; \
+ javax.sound.sampled.spi; \
+ javax.sql; \
+ javax.sql.rowset; \
+ javax.sql.rowset.serial; \
+ javax.sql.rowset.spi; \
+ javax.swing; \
+ javax.swing.border; \
+ javax.swing.colorchooser; \
+ javax.swing.event; \
+ javax.swing.filechooser; \
+ javax.swing.plaf; \
+ javax.swing.plaf.basic; \
+ javax.swing.plaf.metal; \
+ javax.swing.plaf.multi; \
+ javax.swing.plaf.synth; \
+ javax.swing.table; \
+ javax.swing.text; \
+ javax.swing.text.html; \
+ javax.swing.text.html.parser; \
+ javax.swing.text.rtf; \
+ javax.swing.tree; \
+ javax.swing.undo; \
+ javax.tools; \
+ javax.transaction; \
+ javax.transaction.xa; \
+ javax.xml; \
+ javax.xml.bind; \
+ javax.xml.bind.annotation; \
+ javax.xml.bind.annotation.adapters; \
+ javax.xml.bind.attachment; \
+ javax.xml.bind.helpers; \
+ javax.xml.bind.util; \
+ javax.xml.crypto; \
+ javax.xml.crypto.dom; \
+ javax.xml.crypto.dsig; \
+ javax.xml.crypto.dsig.dom; \
+ javax.xml.crypto.dsig.keyinfo; \
+ javax.xml.crypto.dsig.spec; \
+ javax.xml.datatype; \
+ javax.xml.namespace; \
+ javax.xml.parsers; \
+ javax.xml.soap; \
+ javax.xml.stream; \
+ javax.xml.stream.events; \
+ javax.xml.stream.util; \
+ javax.xml.transform; \
+ javax.xml.transform.dom; \
+ javax.xml.transform.sax; \
+ javax.xml.transform.stax; \
+ javax.xml.transform.stream; \
+ javax.xml.validation; \
+ javax.xml.ws; \
+ javax.xml.ws.handler; \
+ javax.xml.ws.handler.soap; \
+ javax.xml.ws.http; \
+ javax.xml.ws.soap; \
+ javax.xml.ws.spi; \
+ javax.xml.xpath; \
+ org.ietf.jgss; \
+ org.jcp.xml.dsig.internal; \
+ org.jcp.xml.dsig.internal.dom; \
+ org.omg.CORBA; \
+ org.omg.CORBA_2_3; \
+ org.omg.CORBA_2_3.portable; \
+ org.omg.CORBA.DynAnyPackage; \
+ org.omg.CORBA.ORBPackage; \
+ org.omg.CORBA.portable; \
+ org.omg.CORBA.TypeCodePackage; \
+ org.omg.CosNaming; \
+ org.omg.CosNaming.NamingContextExtPackage; \
+ org.omg.CosNaming.NamingContextPackage; \
+ org.omg.Dynamic; \
+ org.omg.DynamicAny; \
+ org.omg.DynamicAny.DynAnyFactoryPackage; \
+ org.omg.DynamicAny.DynAnyPackage; \
+ org.omg.IOP; \
+ org.omg.IOP.CodecFactoryPackage; \
+ org.omg.IOP.CodecPackage; \
+ org.omg.Messaging; \
+ org.omg.PortableInterceptor; \
+ org.omg.PortableInterceptor.ORBInitInfoPackage; \
+ org.omg.PortableServer; \
+ org.omg.PortableServer.CurrentPackage; \
+ org.omg.PortableServer.POAManagerPackage; \
+ org.omg.PortableServer.POAPackage; \
+ org.omg.PortableServer.portable; \
+ org.omg.PortableServer.ServantLocatorPackage; \
+ org.omg.SendingContext; \
+ org.omg.stub.java.rmi; \
+ org.omg.stub.javax.management.remote.rmi; \
+ org.w3c.dom; \
+ org.w3c.dom.bootstrap; \
+ org.w3c.dom.css; \
+ org.w3c.dom.events; \
+ org.w3c.dom.html; \
+ org.w3c.dom.ls; \
+ org.w3c.dom.ranges; \
+ org.w3c.dom.stylesheets; \
+ org.w3c.dom.traversal; \
+ org.w3c.dom.views; \
+ org.w3c.dom.xpath; \
+ org.xml.sax; \
+ org.xml.sax.ext; \
+ org.xml.sax.helpers; \
+ version=\"1.6.0\"
diff --git a/installers/src/main/installers/inno-felix.iss b/installers/src/main/installers/inno-felix.iss
index 01492fa..4a3a193 100755
--- a/installers/src/main/installers/inno-felix.iss
+++ b/installers/src/main/installers/inno-felix.iss
@@ -48,9 +48,12 @@
 Source: {#SourceBase}\bin\felix.jar; DestDir: {app}\bin; DestName: felix.jar
 Source: {#SourceBase}\bin\logger.jar; DestDir: {app}\bin; DestName: logger.jar
 Source: {#SourceBase}\bin\daemon.jar; DestDir: {app}\bin; DestName: daemon.jar
+; bundle directory targets
+Source: {#SourceBase}\bundle\*; DestDir: {app}\bundle; Flags: ignoreversion recursesubdirs createallsubdirs
 ; conf directory targets
 Source: {#SourceBase}\conf\log4j.properties; DestDir: {app}\conf; DestName: log4j.properties
 Source: {#SourceBase}\conf\bootstrapper.properties; DestDir: {app}\conf; DestName: bootstrapper.properties
+Source: {#SourceBase}\conf\config.properties; DestDir: {app}\conf; DestName: config.properties
 ; top level directory targets 
 Source: {#SourceBase}\${app.license.name}; DestDir: {app}; DestName: ${app.license.name}
 Source: {#SourceBase}\${app.readme.name}; DestDir: {app}; DestName: ${app.readme.name}