diff --git a/README_GWT b/README_GWT
index 94efff2c084..3b495c83a06 100644
--- a/README_GWT
+++ b/README_GWT
@@ -27,3 +27,12 @@ using a @RemoteServiceRelativePath annotation, such as
 No GWT path library in the Eclipse project settings seems to be required to make
 the project GWT-compilable and executable within an OSGi container with Jetty
 support.
+
+Next, create a new "Web Application" launch configuration, specifying in the "Server"
+tab to not "Run built-in server." Instead, the running OSGi container's Jetty with the
+registered servlet will be used. In the "GWT" tab I chose "Automatically select an unused
+port" instead of providing a fixed Code Server Port.
+
+With this, when I launch the new Web Application configuration, my Firefox opens,
+e.g., with the URL http://127.0.0.1:8888/Com_sap_sailing_gwt_ui.html?gwt.codesvr=127.0.0.1:56824
+and displays the web app. I can set breakpoints in the client part as well as in the servlet.
diff --git a/java/com.sap.sailing.gwt.ui/SailingGWT.launch b/java/com.sap.sailing.gwt.ui/SailingGWT.launch
new file mode 100755
index 00000000000..d89fcaa0704
--- /dev/null
+++ b/java/com.sap.sailing.gwt.ui/SailingGWT.launch
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="com.google.gdt.eclipse.suite.webapp">
+<booleanAttribute key="com.google.gdt.eclipse.core.AUTO_PORT_SELECTION" value="true"/>
+<booleanAttribute key="com.google.gdt.eclipse.core.RUN_SERVER" value="false"/>
+<stringAttribute key="com.google.gdt.eclipse.suiteMainTypeProcessor.PREVIOUSLY_SET_MAIN_TYPE_NAME" value="com.google.gwt.dev.DevMode"/>
+<booleanAttribute key="com.google.gdt.eclipse.suiteWarArgumentProcessor.IS_WAR_FROM_PROJECT_PROPERTIES" value="true"/>
+<booleanAttribute key="com.google.gwt.eclipse.core.CODE_SERVER_PORT_AUTO" value="true"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/com.sap.sailing.gwt.ui"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="com.google.gwt.eclipse.core.moduleClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.DevMode"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-noserver -remoteUI &quot;${gwt_remote_ui_server_port}:${unique_id}&quot; -logLevel INFO -codeServerPort auto -war C:\data\SAP\sailing\workspace\java\com.sap.sailing.gwt.ui\war com.sap.sailing.gwt.ui.com_sap_sailing_gwt_ui"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.sap.sailing.gwt.ui"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m"/>
+</launchConfiguration>
diff --git a/java/com.sap.sailing.gwt.ui/war/WEB-INF/deploy/com_sap_sailing_gwt_ui/rpcPolicyManifest/manifest.txt b/java/com.sap.sailing.gwt.ui/war/WEB-INF/deploy/com_sap_sailing_gwt_ui/rpcPolicyManifest/manifest.txt
index 52be070d13b..acd60541e12 100755
--- a/java/com.sap.sailing.gwt.ui/war/WEB-INF/deploy/com_sap_sailing_gwt_ui/rpcPolicyManifest/manifest.txt
+++ b/java/com.sap.sailing.gwt.ui/war/WEB-INF/deploy/com_sap_sailing_gwt_ui/rpcPolicyManifest/manifest.txt
@@ -1,3 +1,2 @@
 # Module com_sap_sailing_gwt_ui
 # RPC service class, partial path of RPC policy file
-com.sap.sailing.gwt.ui.client.GreetingService, 82043305890EB51D0A982181ECFF233C.gwt.rpc