diff --git a/repos/os/src/drivers/input/ps2/x86/i8042.h b/repos/os/src/drivers/input/ps2/x86/i8042.h
index 681c826d4..5154168cc 100644
--- a/repos/os/src/drivers/input/ps2/x86/i8042.h
+++ b/repos/os/src/drivers/input/ps2/x86/i8042.h
@@ -140,8 +140,8 @@ class I8042
 
 	private:
 
-		Genode::Io_port_connection _data_port;  /* data port */
-		Genode::Io_port_connection _stat_port;  /* status/command port */
+		Genode::Io_port_session_client _data_port;  /* data port */
+		Genode::Io_port_session_client _stat_port;  /* status/command port */
 		bool                       _kbd_xlate;  /* translation mode to scan-code set 1 */
 
 		/**
@@ -217,9 +217,10 @@ class I8042
 		/**
 		 * Constructor
 		 */
-		I8042() :
-			_data_port(REG_DATA,   1),
-			_stat_port(REG_STATUS, 1),
+		I8042(Genode::Io_port_session_capability cap_data,
+		      Genode::Io_port_session_capability cap_status) :
+			_data_port(cap_data),
+			_stat_port(cap_status),
 			_kbd_interface(*this, false),
 			_aux_interface(*this, true)
 		{
diff --git a/repos/os/src/drivers/input/ps2/x86/main.cc b/repos/os/src/drivers/input/ps2/x86/main.cc
index 1438e7cf8..0ca5a5724 100644
--- a/repos/os/src/drivers/input/ps2/x86/main.cc
+++ b/repos/os/src/drivers/input/ps2/x86/main.cc
@@ -35,25 +35,30 @@ struct Main
 {
 	Server::Entrypoint &ep;
 
-	I8042                    i8042;
 	Input::Session_component session;
 	Input::Root_component    root;
 
-	Ps2_mouse    ps2_mouse;
-	Ps2_keyboard ps2_keybd;
-
-	Pci::Connection platform;
+	Pci::Connection    platform;
 	Pci::Device_client device_ps2;
 
+	I8042              i8042;
+
+	Ps2_keyboard ps2_keybd;
+	Ps2_mouse    ps2_mouse;
+
 	Irq_handler  ps2_keybd_irq;
 	Irq_handler  ps2_mouse_irq;
 
+	enum { REG_IOPORT_DATA = 0, REG_IOPORT_STATUS};
+
 	Main(Server::Entrypoint &ep)
 	: ep(ep), root(ep.rpc_ep(), session),
-		ps2_mouse(*i8042.aux_interface(), session.event_queue()),
+		device_ps2(platform.device("PS2")),
+		i8042(device_ps2.io_port(REG_IOPORT_DATA),
+		      device_ps2.io_port(REG_IOPORT_STATUS)),
 		ps2_keybd(*i8042.kbd_interface(), session.event_queue(),
 		          i8042.kbd_xlate()),
-		device_ps2(platform.device("PS2")),
+		ps2_mouse(*i8042.aux_interface(), session.event_queue()),
 		ps2_keybd_irq(ep, ps2_keybd, device_ps2.irq(0)),
 		ps2_mouse_irq(ep, ps2_mouse, device_ps2.irq(1))
 	{