diff --git a/os-jdg-launch/added/launch/standalone.sh b/os-jdg-launch/added/launch/standalone.sh
new file mode 100644
index 00000000..2214acb9
--- /dev/null
+++ b/os-jdg-launch/added/launch/standalone.sh
@@ -0,0 +1,12 @@
+
+function configure(){
+  modify_standalone_sh
+}
+
+function modify_standalone_sh() {
+  # Enhance standalone.sh to make remote JAVA debugging possible by specifying
+  # DEBUG=true environment variable
+  sed -i 's|DEBUG_MODE=false|DEBUG_MODE="${DEBUG:-false}"|' $JBOSS_HOME/bin/standalone.sh
+  sed -i 's|DEBUG_PORT="8787"|DEBUG_PORT="${DEBUG_PORT:-8787}"|' $JBOSS_HOME/bin/standalone.sh
+}
+
diff --git a/os-jdg-launch/added/openshift-launch.sh b/os-jdg-launch/added/openshift-launch.sh
index ad853d2b..636b9603 100755
--- a/os-jdg-launch/added/openshift-launch.sh
+++ b/os-jdg-launch/added/openshift-launch.sh
@@ -22,6 +22,7 @@ CONFIGURE_SCRIPTS=(
   $JBOSS_HOME/bin/launch/security-domains.sh
   $JBOSS_HOME/bin/launch/infinispan-config.sh
   $JBOSS_HOME/bin/launch/access_log_valve.sh
+  $JBOSS_HOME/bin/launch/standalone.sh
   /opt/run-java/proxy-options
 )
 
diff --git a/os-jdg-launch/configure.sh b/os-jdg-launch/configure.sh
index 24ca8ab7..adf6af50 100755
--- a/os-jdg-launch/configure.sh
+++ b/os-jdg-launch/configure.sh
@@ -8,6 +8,8 @@ ADDED_DIR=${SCRIPT_DIR}/added
 
 cp -p ${ADDED_DIR}/openshift-launch.sh $JBOSS_HOME/bin/
 
+cp -p ${ADDED_DIR}/launch/standalone.sh $JBOSS_HOME/bin/launch
+
 # Add infinispan config script
 cp -p ${ADDED_DIR}/launch/infinispan-config.sh $JBOSS_HOME/bin/launch