diff --git a/upnp/basedriver/pom.xml b/upnp/basedriver/pom.xml
index d7ed87d..36a34f1 100644
--- a/upnp/basedriver/pom.xml
+++ b/upnp/basedriver/pom.xml
@@ -99,14 +99,19 @@
                 <!--Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
                   <Embed-Transitive>true</Embed-Transitive-->
                 <Export-Package>
-                  org.apache.felix.upnp.basedriver.controller;version=0.1,
-                  org.apache.felix.upnp.basedriver.util;version=0.3
-                  
+                  org.apache.felix.upnp.basedriver.controller;version=0.1.0,
+                  org.apache.felix.upnp.basedriver.util;version=0.3.0
+                  org.apache.felix.upnp.basedriver.resources;version=0.3.0
                 </Export-Package>
                 <Import-Package>org.osgi.*</Import-Package>
                 <Private-Package>
-                  org.apache.felix.upnp.basedriver.*, org.kxml2.io,
-                  org.xmlpull.v1, org.cybergarage.*,
+                  org.apache.felix.upnp.basedriver.controller.impl,
+                  org.apache.felix.upnp.basedriver.importer.*,
+                  org.apache.felix.upnp.basedriver.export.*,
+                  org.apache.felix.upnp.basedriver.tool,
+                  org.apache.felix.upnp.basedriver,
+                  org.kxml2.io, org.xmlpull.v1,
+                  org.cybergarage.*,
                   org.apache.xerces.impl.dv.util
                 </Private-Package>
               </instructions>
diff --git a/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/Activator.java b/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/Activator.java
index a2fcd97..c9cefc7 100644
--- a/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/Activator.java
+++ b/upnp/basedriver/src/main/java/org/apache/felix/upnp/basedriver/Activator.java
@@ -178,8 +178,14 @@
 	    ))	    	
 	    {
 	    	boolean useOnlyIPV6 = Boolean.valueOf(configuration.getProperty(Constants.NET_ONLY_IPV6_PROP,"false")).booleanValue();
-	    	if (useOnlyIPV6) UPnP.setEnable(UPnP.USE_ONLY_IPV6_ADDR);
-	    	else UPnP.setDisable(UPnP.USE_ONLY_IPV6_ADDR);
+		
+		/*
+		 * Defining an alias for UPnP.USE_ONLY_IPV6_ADDR in order to allow compilation of the code either with upnp-stack and upnp-stack-jdk13
+		 */
+		final int ALIAS_USE_ONLY_IPV6_ADDR=1;
+		
+	    	if (useOnlyIPV6) UPnP.setEnable(ALIAS_USE_ONLY_IPV6_ADDR);
+	    	else UPnP.setDisable(ALIAS_USE_ONLY_IPV6_ADDR);
 	    }
 	    
 		boolean useLoopback = Boolean.valueOf(configuration.getProperty(Constants.NET_USE_LOOPBACK_PROP,"false")).booleanValue();