diff --git a/library/server/wsf/connector/openshift-safe.ecf b/library/server/wsf/connector/openshift-safe.ecf
new file mode 100644
index 00000000..50e1a697
--- /dev/null
+++ b/library/server/wsf/connector/openshift-safe.ecf
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-8-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-8-0 http://www.eiffel.com/developers/xml/configuration-1-8-0.xsd" name="wsf_openshift" uuid="39488429-3940-4360-9A32-FE53298C2CA2" library_target="wsf_openshift">
+	<target name="wsf_openshift">
+		<root all_classes="true"/>
+		<file_rule>
+			<exclude>/EIFGENs$</exclude>
+			<exclude>/\.git$</exclude>
+			<exclude>/\.svn$</exclude>
+		</file_rule>
+		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="provisional">
+		</option>
+		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
+		<library name="ewsgi" location="../../ewsgi/ewsgi-safe.ecf"/>
+		<library name="wsf" location="../wsf-safe.ecf"/>
+		<library name="wsf_connector_nino" location="nino-safe.ecf"/>
+		<cluster name="wsf_openshift" location="./openshift" recursive="true"/>
+	</target>
+</system>
diff --git a/library/server/wsf/connector/openshift/wsf_openshift_service_launcher.e b/library/server/wsf/connector/openshift/wsf_openshift_service_launcher.e
new file mode 100644
index 00000000..507f34d3
--- /dev/null
+++ b/library/server/wsf/connector/openshift/wsf_openshift_service_launcher.e
@@ -0,0 +1,83 @@
+note
+	description: "[
+			Component to launch the service using the default connector
+
+				Eiffel Web Nino customized for OpenShift
+
+
+				This default connector support options:
+					base: base_url (very specific to standalone server)
+					verbose: to display verbose output, useful for Nino
+					force_single_threaded: use only one thread, useful for Nino
+
+			check WSF_SERVICE_LAUNCHER for more documentation
+		]"
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	WSF_OPENSHIFT_SERVICE_LAUNCHER
+
+inherit
+	WSF_NINO_SERVICE_LAUNCHER
+		redefine
+			initialize
+		end
+
+create
+	make,
+	make_and_launch,
+	make_callback,
+	make_callback_and_launch
+
+feature {NONE} -- Initialization
+
+	initialize
+		local
+			l_env: EXECUTION_ENVIRONMENT
+		do
+			Precursor
+			create l_env
+			if attached l_env.get (Openshift_port) as l_port then
+				if l_port.is_integer then
+					port_number := l_port.to_integer
+				else
+					die ("could not parse " + Openshift_port)
+				end
+			else
+				die (Openshift_port + " is not defined")
+			end
+		end
+
+feature {NONE} -- Implementation
+
+	die (a_message: STRING)
+			-- Die with `a_message'.
+		local
+			l_exceptions: EXCEPTIONS
+		do
+			io.put_string (a_message)
+			io.put_new_line
+			create l_exceptions
+			l_exceptions.die (1)
+		end
+
+	Openshift_ip: STRING = "OPENSHIFT_INTERNAL_IP"
+			-- OpenShift IP environment variable name
+
+	Openshift_port: STRING = "OPENSHIFT_INTERNAL_PORT"
+			-- OpenShift port environment variable name
+		
+
+;note
+	copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+	source: "[
+			Eiffel Software
+			5949 Hollister Ave., Goleta, CA 93117 USA
+			Telephone 805-685-1006, Fax 805-685-6869
+			Website http://www.eiffel.com
+			Customer support http://support.eiffel.com
+		]"
+
+end
diff --git a/library/server/wsf/default/openshift-safe.ecf b/library/server/wsf/default/openshift-safe.ecf
new file mode 100644
index 00000000..1f5a6c95
--- /dev/null
+++ b/library/server/wsf/default/openshift-safe.ecf
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-8-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-8-0 http://www.eiffel.com/developers/xml/configuration-1-8-0.xsd" name="default_openshift" uuid="9EDB2BD1-9E1B-4931-ADD2-2724E3A25CBF" library_target="default_openshift">
+	<target name="default_openshift">
+		<root all_classes="true"/>
+		<file_rule>
+			<exclude>/EIFGENs$</exclude>
+			<exclude>/\.git$</exclude>
+			<exclude>/\.svn$</exclude>
+		</file_rule>
+		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="provisional"/>
+		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
+		<library name="wsf" location="../wsf-safe.ecf"/>
+		<library name="wsf_openshift" location="../connector/openshift-safe.ecf"/>
+		<cluster name="default_openshift" location="./openshift" recursive="true"/>
+	</target>
+</system>
diff --git a/library/server/wsf/default/openshift/wsf_default_response_service.e b/library/server/wsf/default/openshift/wsf_default_response_service.e
new file mode 100644
index 00000000..0cefc7da
--- /dev/null
+++ b/library/server/wsf/default/openshift/wsf_default_response_service.e
@@ -0,0 +1,24 @@
+note
+	description: "Summary description for {WSF_DEFAULT_RESPONSE_SERVICE}."
+	date: "$Date$"
+	revision: "$Revision$"
+
+deferred class
+	WSF_DEFAULT_RESPONSE_SERVICE	
+
+inherit
+	WSF_DEFAULT_SERVICE
+
+	WSF_RESPONSE_SERVICE
+
+note
+	copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+	source: "[
+			Eiffel Software
+			5949 Hollister Ave., Goleta, CA 93117 USA
+			Telephone 805-685-1006, Fax 805-685-6869
+			Website http://www.eiffel.com
+			Customer support http://support.eiffel.com
+		]"
+end
diff --git a/library/server/wsf/default/openshift/wsf_default_service.e b/library/server/wsf/default/openshift/wsf_default_service.e
new file mode 100644
index 00000000..dd76ca78
--- /dev/null
+++ b/library/server/wsf/default/openshift/wsf_default_service.e
@@ -0,0 +1,22 @@
+note
+	description: "Summary description for {WSF_DEFAULT_SERVICE}."
+	date: "$Date$"
+	revision: "$Revision$"
+
+deferred class
+	WSF_DEFAULT_SERVICE
+
+inherit
+	WSF_DEFAULT_SERVICE_I [WSF_DEFAULT_SERVICE_LAUNCHER]
+
+note
+	copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+	source: "[
+			Eiffel Software
+			5949 Hollister Ave., Goleta, CA 93117 USA
+			Telephone 805-685-1006, Fax 805-685-6869
+			Website http://www.eiffel.com
+			Customer support http://support.eiffel.com
+		]"
+end
diff --git a/library/server/wsf/default/openshift/wsf_default_service_launcher.e b/library/server/wsf/default/openshift/wsf_default_service_launcher.e
new file mode 100644
index 00000000..a648940a
--- /dev/null
+++ b/library/server/wsf/default/openshift/wsf_default_service_launcher.e
@@ -0,0 +1,31 @@
+note
+	description: "[
+			Default launcher for WSF_SERVICE based on {WSF_OPENSHIFT_SERVICE_LAUNCHER}
+		]"
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	WSF_DEFAULT_SERVICE_LAUNCHER
+
+inherit
+	WSF_OPENSHIFT_SERVICE_LAUNCHER
+
+create
+	make,
+	make_and_launch,
+	make_callback,
+	make_callback_and_launch
+
+note
+	copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+	source: "[
+			Eiffel Software
+			5949 Hollister Ave., Goleta, CA 93117 USA
+			Telephone 805-685-1006, Fax 805-685-6869
+			Website http://www.eiffel.com
+			Customer support http://support.eiffel.com
+		]"
+
+end