diff --git a/lib/jboss-appliance-support b/lib/jboss-appliance-support
index 81c0fcd..0d2ce6f 160000
--- a/lib/jboss-appliance-support
+++ b/lib/jboss-appliance-support
@@ -1 +1 @@
-Subproject commit 81c0fcd1be2d952630c37aace11f41d7e6e08cac
+Subproject commit 0d2ce6fefea9b436218b94a08928a6f8db59dd40
diff --git a/src/agent-configuration.xml b/src/agent-configuration.xml
index 68bf80c..738c857 100644
--- a/src/agent-configuration.xml
+++ b/src/agent-configuration.xml
@@ -95,9 +95,8 @@ commands named "config", "setconfig" and "setup" and the command line options
                this if the agent platform's FQDN cannot be reliably determined
                at runtime.
                -->
-               <!--
-               <entry key="rhq.agent.name" value="my.hostname.com"/>
-               -->
+
+               <entry key="rhq.agent.name" value="#AGENT_NAME#"/>
 
                <!--
                _______________________________________________________________
diff --git a/src/jopr-agent-install.sh b/src/jopr-agent-install.sh
index 88585f3..8d609f7 100644
--- a/src/jopr-agent-install.sh
+++ b/src/jopr-agent-install.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+[ -f /etc/sysconfig/jboss-cloud ] && . /etc/sysconfig/jboss-cloud
+
 JOPR_AGENT_HOME=/opt/jopr-agent
 
 [ -f /etc/sysconfig/jopr-agent ] && . /etc/sysconfig/jopr-agent
@@ -29,3 +31,5 @@ done
 cd $JOPR_AGENT_HOME
 
 java -jar jopr-agent.jar --install
+
+sed -i s/#AGENT_NAME#/$APPLIANCE_NAME-$HOSTNAME/g $JOPR_AGENT_HOME/rhq-agent/conf/agent-configuration.xml