diff --git a/org.adempiere.ui.swing/META-INF/MANIFEST.MF b/org.adempiere.ui.swing/META-INF/MANIFEST.MF
index 905630bf68..103e65dc58 100644
--- a/org.adempiere.ui.swing/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui.swing/META-INF/MANIFEST.MF
@@ -86,5 +86,5 @@ Import-Package: javax.net.ssl,
  org.restlet.security,
  org.restlet.service,
  org.restlet.util
-Service-Component: OSGI-INF/defaultpaymentformfactory.xml
+Service-Component: OSGI-INF/defaultpaymentformfactory.xml, OSGI-INF/serverinterface.xml, OSGI-INF/statusinterface.xml
 Bundle-ActivationPolicy: lazy
diff --git a/org.adempiere.ui.swing/OSGI-INF/serverinterface.xml b/org.adempiere.ui.swing/OSGI-INF/serverinterface.xml
new file mode 100644
index 0000000000..7fdd25a815
--- /dev/null
+++ b/org.adempiere.ui.swing/OSGI-INF/serverinterface.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.ui.swing.interfaces.server">
+   <implementation class="org.adempiere.client.ServerInterface"/>
+   <service>
+      <provide interface="org.compiere.interfaces.Server"/>
+   </service>
+   <property name="service.ranking" type="Integer" value="1"/>
+</scr:component>
diff --git a/org.adempiere.ui.swing/OSGI-INF/statusinterface.xml b/org.adempiere.ui.swing/OSGI-INF/statusinterface.xml
new file mode 100644
index 0000000000..59ac0ed555
--- /dev/null
+++ b/org.adempiere.ui.swing/OSGI-INF/statusinterface.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.ui.swing.interfaces.status">
+   <implementation class="org.adempiere.client.StatusInterface"/>
+   <service>
+      <provide interface="org.compiere.interfaces.Status"/>
+   </service>
+   <property name="service.ranking" type="Integer" value="1"/>
+</scr:component>