diff --git a/foei-components/pom.xml b/foei-components/pom.xml
index 76628de..0642988 100644
--- a/foei-components/pom.xml
+++ b/foei-components/pom.xml
@@ -3,18 +3,18 @@
   <parent>
     <groupId>com.idcanet.foei</groupId>
     <artifactId>foei-base</artifactId>
-    <version>0.8-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
   </parent>
   <groupId>com.idcanet.foei</groupId>
   <artifactId>foei-components</artifactId>
-  <version>0.8-SNAPSHOT</version>
+  <version>0.8.1-SNAPSHOT</version>
   <name>foei-components</name>
   <description>foei-component</description>
   <dependencies>
     <dependency>
       <groupId>com.idcanet.foei</groupId>
       <artifactId>foei-core</artifactId>
-      <version>0.8-SNAPSHOT</version>
+      <version>${project.version}</version>
 	</dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/foei-core/pom.xml b/foei-core/pom.xml
index c8bae11..1576e76 100644
--- a/foei-core/pom.xml
+++ b/foei-core/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <groupId>com.idcanet.foei</groupId>
     <artifactId>foei-base</artifactId>
-    <version>0.8-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
   </parent>
   <groupId>com.idcanet.foei</groupId>
   <artifactId>foei-core</artifactId>
-  <version>0.8-SNAPSHOT</version>
+  <version>0.8.1-SNAPSHOT</version>
   <name>foei-core</name>
   <description>foei-core</description>
   <dependencies>
diff --git a/foei-core/src/main/java/com/idcanet/foei/utils/jndi/MemoryContext.java b/foei-core/src/main/java/com/idcanet/foei/utils/jndi/MemoryContext.java
index 7e20496..c86b163 100644
--- a/foei-core/src/main/java/com/idcanet/foei/utils/jndi/MemoryContext.java
+++ b/foei-core/src/main/java/com/idcanet/foei/utils/jndi/MemoryContext.java
@@ -372,9 +372,7 @@ public class MemoryContext implements Context {
     	return listBindings(new CompositeName(name));
     }
 
-    public NamingEnumeration listBindings(Name name) throws NamingException
-	{
-    	//System.err.println("FoeiContext list bindings is called "+this+" map size:"+bindings.size());
+    public NamingEnumeration listBindings(Name name) throws NamingException {
     	
         if (name.isEmpty()) {
             // listing this context
diff --git a/foei-ee-ejb3/pom.xml b/foei-ee-ejb3/pom.xml
index 09b599e..e1c5f78 100644
--- a/foei-ee-ejb3/pom.xml
+++ b/foei-ee-ejb3/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <groupId>com.idcanet.foei</groupId>
     <artifactId>foei-base</artifactId>
-    <version>0.8-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
   </parent>
   <groupId>com.idcanet.foei</groupId>
   <artifactId>foei-ee-ejb3</artifactId>
-  <version>0.8-SNAPSHOT</version>
+  <version>0.8.1-SNAPSHOT</version>
   <name>foei-ee-ejb3</name>
   <description>foei-ee-ejb3</description>
 </project>
\ No newline at end of file
diff --git a/foei-ee-jca/pom.xml b/foei-ee-jca/pom.xml
index b6df71f..5a64c62 100644
--- a/foei-ee-jca/pom.xml
+++ b/foei-ee-jca/pom.xml
@@ -3,18 +3,18 @@
   <parent>
     <groupId>com.idcanet.foei</groupId>
     <artifactId>foei-base</artifactId>
-    <version>0.8-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
   </parent>
   <groupId>com.idcanet.foei</groupId>
   <artifactId>foei-ee-jca</artifactId>
-  <version>0.8-SNAPSHOT</version>
+  <version>0.8.1-SNAPSHOT</version>
   <name>foei-ee-jca</name>
   <description>foei-ee-jca</description>
   <dependencies>
     <dependency>
       <groupId>com.idcanet.foei</groupId>
       <artifactId>foei-core</artifactId>
-      <version>0.8-SNAPSHOT</version>
+      <version>${project.version}</version>
 	</dependency>
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
diff --git a/foei-server/pom.xml b/foei-server/pom.xml
index 75f22b8..71cd0fb 100644
--- a/foei-server/pom.xml
+++ b/foei-server/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <groupId>com.idcanet.foei</groupId>
     <artifactId>foei-base</artifactId>
-    <version>0.8-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
   </parent>
   <groupId>com.idcanet.foei</groupId>
   <artifactId>foei-server</artifactId>
-  <version>0.8-SNAPSHOT</version>
+  <version>0.8.1-SNAPSHOT</version>
   <name>foei-server</name>
   <description>foei-server</description>
   <dependencies>
diff --git a/pom.xml b/pom.xml
index 263f6d9..5e8e47e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,10 +5,30 @@
 <groupId>com.idcanet.foei</groupId>
 <artifactId>foei-base</artifactId>
 <packaging>pom</packaging>
-<version>0.8-SNAPSHOT</version>
+<version>0.8.1-SNAPSHOT</version>
 <name>foei</name>
 <description>Creates an easy xml layer for objects and creating your own xml language implementions.</description>
 <url>http://www.x4o.org/foei</url>
+<inceptionYear>2002</inceptionYear>
+<organization>
+	<name>IDCA</name>
+	<url>http://www.idca.nl</url>
+</organization>
+<issueManagement>
+	<system>Trac</system>
+	<url>https://decaid.idca.nl/trac/oss/</url>
+</issueManagement>
+<licenses>
+	<license>
+		<name>BSD</name>
+		<url>http://repository.idcanet.com/licenses/bsd.txt</url>
+	</license>
+</licenses>
+<scm>
+	<connection>https://decaid.idca.nl/hg/com.idcanet.foei/</connection>
+	<developerConnection>scm:hg:${hg.repo.url}</developerConnection>
+	<url>https://decaid.idca.nl/hg/com.idcanet.foei/file/</url>
+</scm>
 <modules>
 	<module>foei-core</module>
 	<module>foei-server</module>
@@ -17,57 +37,15 @@
 	<module>foei-ee-ejb3</module>
 </modules>
 <properties>
+	<hg.repo.url>https://decaid.idca.nl/hg/com.idcanet.foei/</hg.repo.url>
+    <staging.mvn.repo.url>file://${project.build.directory}/target-maven-repo</staging.mvn.repo.url>
 	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	<juel.version>2.1.0</juel.version>
 	<testng.version>5.8</testng.version>
-	<x4o-core.version>0.8-SNAPSHOT</x4o-core.version>
+	<x4o-core.version>0.8.1</x4o-core.version>
 	<servlet-api.version>2.4</servlet-api.version>
 </properties>
-<organization>
-	<name>IDCA</name>
-	<url>http://www.idca.nl</url>
-</organization>
-<issueManagement>
-	<system>Trac</system>
-	<url>https://decaid.idca.nl/trac/oss/</url>
-</issueManagement>    
-<scm>
-	<connection>scm:svn:https://decaid.idca.nl/svn/oss/com.idcanet.foei/</connection>
-	<developerConnection>scm:svn:https://decaid.idca.nl/svn/oss/com.idcanet.foei/</developerConnection>
-	<url>https://decaid.idca.nl/svn/oss/com.idcanet.foei/</url>
-</scm>
-<developers>
-	<developer>
-		<id>willem.cazander</id>
-		<name>Willem Cazander</name>
-		<email>w.cazander@gmail.com</email>
-		<organization>IDCA</organization>
-		<timezone>+2</timezone>
-		<roles>
-            <role>Project Manager</role>
-            <role>Architect</role>
-		</roles>
-	</developer>
-	<developer>
-		<id>sqrbass</id>
-		<name>Bas van Oostveen</name>
-		<email></email>
-		<organization>IDCA</organization>
-		<timezone>+2</timezone>
-		<roles>
-            <role>Architect Reviewer</role>
-		</roles>
-	</developer>
-</developers>
-<repositories>
-	<repository>
-		<id>jboss</id>
-		<name>JBoss Repository Switchboard</name>
-		<layout>default</layout>
-		<url>http://repository.jboss.com/maven2/</url>
-		<snapshots><enabled>true</enabled></snapshots>
-	</repository>
-</repositories>
+
 <dependencies>
 	<dependency>
     	<groupId>org.testng</groupId>
@@ -128,7 +106,30 @@
 			<version>2.4</version>
 			<configuration></configuration>			
 		</plugin>
+		
+		<!-- Perform maven releases -->
+		<plugin>
+			<groupId>org.apache.maven.plugins</groupId>
+			<artifactId>maven-release-plugin</artifactId>
+			<version>2.1</version>
+			<configuration>
+				<preparationGoals>clean install verify</preparationGoals>
+				<!-- rmed assembly:assembly  -->
+				<goals>clean install javadoc:javadoc deploy</goals>
+				<arguments>-Prelease -DaltDeploymentRepository="${altDeploymentRepository}"</arguments>
+			</configuration>
+		</plugin>
+		
 	</plugins>
+    <pluginManagement>
+    	<plugins>
+    		<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-release-plugin</artifactId>
+				<version>2.1</version>
+			</plugin>
+    	</plugins>
+	</pluginManagement>
 </build>
     
 <reporting>
@@ -189,5 +190,212 @@
 	</plugins> 
 </reporting>
 
+<repositories>
+	<repository>
+		<id>local</id>
+		<url>http://localhost:8081/nexus/content/groups/public/</url>
+		<snapshots><enabled>true</enabled></snapshots>
+		<releases><enabled>true</enabled></releases>
+	</repository>
+	<repository>
+		<id>jboss</id>
+		<name>JBoss Repository Switchboard</name>
+		<layout>default</layout>
+		<url>http://repository.jboss.com/maven2/</url>
+		<snapshots><enabled>true</enabled></snapshots>
+	</repository>
+</repositories>
+
+<!-- PluginRepositories -->
+<pluginRepositories>
+	<pluginRepository>
+		<id>local</id>
+		<url>http://localhost:8081/nexus/content/groups/public/</url>
+		<snapshots><enabled>true</enabled></snapshots>
+		<releases><enabled>true</enabled></releases>
+	</pluginRepository>
+</pluginRepositories>
+
+<!-- DistributionManagement -->
+<distributionManagement>
+	<repository>
+		<id>releases</id>
+		<name>Internal Releases</name>
+		<url>http://localhost:8081/nexus/content/repositories/releases</url>
+	</repository>
+	<snapshotRepository>
+		<id>snapshots</id>
+		<name>Internal Snapshots</name>
+		<url>http://localhost:8081/nexus/content/repositories/snapshots</url>
+	</snapshotRepository>
+</distributionManagement>
+
+<developers>
+	<developer>
+		<id>willem.cazander</id>
+		<name>Willem Cazander</name>
+		<email>w.cazander@gmail.com</email>
+		<organization>IDCA</organization>
+		<timezone>+2</timezone>
+		<roles>
+            <role>Project Manager</role>
+            <role>Architect</role>
+		</roles>
+	</developer>
+	<developer>
+		<id>sqrbass</id>
+		<name>Bas van Oostveen</name>
+		<email></email>
+		<organization>IDCA</organization>
+		<timezone>+2</timezone>
+		<roles>
+            <role>Architect Reviewer</role>
+		</roles>
+	</developer>
+</developers>
+
+<!-- Profiles -->
+<profiles>
+  <profile>
+      <id>release</id>
+      <properties>
+          <hg.repo.url>file://${project.build.directory}/dummy-hg-repo</hg.repo.url>
+          <altDeploymentRepository>release-repo-hudson::default::${staging.mvn.repo.url}</altDeploymentRepository>
+      </properties>
+      <build>
+          <plugins>
+              <plugin>
+                  <groupId>org.codehaus.mojo</groupId>
+                  <artifactId>exec-maven-plugin</artifactId>
+                  <executions>
+                      <execution>
+                          <id>clean-release-dirs</id>
+                          <phase>initialize</phase>
+                          <goals>
+                              <goal>exec</goal>
+                          </goals>
+                          <inherited>false</inherited>
+                          <configuration>
+                              <executable>rm</executable>
+                              <arguments>
+                                  <argument>-rf</argument>
+                                  <argument>${project.build.directory}/dummy-hg-repo</argument>
+                                  <argument>${project.build.directory}/target-maven-repo</argument>
+                              </arguments>
+                          </configuration>
+                      </execution>
+                      <execution>
+                          <id>create-release-dirs</id>
+                          <phase>initialize</phase>
+                          <goals>
+                              <goal>exec</goal>
+                          </goals>
+                          <inherited>false</inherited>
+                          <configuration>
+                              <executable>mkdir</executable>
+                              <arguments>
+                                  <argument>-p</argument>
+                                  <argument>${project.build.directory}/dummy-hg-repo</argument>
+                                  <argument>${project.build.directory}/target-maven-repo</argument>
+                              </arguments>
+                          </configuration>
+                      </execution>
+                      <execution>
+                          <id>init-dummy-hg-repo</id>
+                          <phase>initialize</phase>
+                          <goals>
+                              <goal>exec</goal>
+                          </goals>
+                          <inherited>false</inherited>
+                          <configuration>
+                              <executable>hg</executable>
+                              <workingDirectory>${project.build.directory}/dummy-hg-repo</workingDirectory>
+                              <arguments>
+                                  <argument>init</argument>
+                              </arguments>
+                          </configuration>
+                      </execution>
+                  </executions>
+              </plugin>
+          </plugins>
+      </build>
+  </profile>
+  <profile>
+    <id>release-commit</id>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>push-hg</id>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <inherited>false</inherited>
+                        <configuration>
+                            <executable>hg</executable>
+                            <arguments>
+                                <argument>push</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>wagon-maven-plugin</artifactId>
+                <configuration>
+                    <source>${staging.mvn.repo.url}</source>
+                    <target>${project.distributionManagement.repository.url}</target>
+                    <targetId>${project.distributionManagement.repository.id}</targetId>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>merge-repo</id>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>merge-maven-repos</goal>
+                        </goals>
+                        <inherited>false</inherited>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+  </profile>
+  <profile>
+    <id>release-cancel</id>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>strip-hg</id>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <inherited>false</inherited>
+                        <configuration>
+                            <!-- FIXME: would be better to strip local changes -->
+                            <executable>rm</executable>
+                            <arguments>
+                                <argument>-rf</argument>
+                                <argument>.hg</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+  </profile>
+</profiles>
+
 <!-- END --> 
 </project>
\ No newline at end of file