diff --git a/cameo-server-jzmq/pom.xml b/cameo-server-jzmq/pom.xml
index ada0ccabd92e66798fe02b2d7bcee1df92b76048..2ccd1322d3c258de968ca27f9509266b7157e3da 100644
--- a/cameo-server-jzmq/pom.xml
+++ b/cameo-server-jzmq/pom.xml
@@ -13,7 +13,7 @@
 		<dependency>
 			<groupId>fr.ill.ics</groupId>
 			<artifactId>cameo-server</artifactId>
-			<version>0.1.5</version>
+			<version>0.1.6</version>
 			<exclusions>
 				<exclusion>
 					<groupId>fr.ill.ics</groupId>
diff --git a/cameo-server/src/main/java/fr/ill/ics/cameo/manager/ConfigManager.java b/cameo-server/src/main/java/fr/ill/ics/cameo/manager/ConfigManager.java
index aa28691217bb4ccc73e8d48f97a7264067351742..099e46271784c973117d123963eabe1908edd9e7 100644
--- a/cameo-server/src/main/java/fr/ill/ics/cameo/manager/ConfigManager.java
+++ b/cameo-server/src/main/java/fr/ill/ics/cameo/manager/ConfigManager.java
@@ -162,11 +162,19 @@ public final class ConfigManager {
 	}
 	
 	public void setHost(String host) {
+		// If host is provided, set it.
 		if (host == null) {
 			try {
+				// Otherwise try to get the hostname.
 				this.host = InetAddress.getLocalHost().getHostName();
 			} catch (UnknownHostException e) {
-				this.host = "localhost";
+				try {
+					// Otherwise try to get the IP address.
+					this.host = InetAddress.getLocalHost().getHostAddress();
+				} catch (UnknownHostException e2) {
+					// Otherwise set localhost.
+					this.host = "localhost";
+				}
 			}
 		} else {
 			this.host = host;