Index: contrib/arch/HelenOS.adl
===================================================================
--- contrib/arch/HelenOS.adl	(revision b988db0c0ee79f5bd7ba4be405e20796a2dce99c)
+++ contrib/arch/HelenOS.adl	(revision 7a53208993259654ee1ffae54fb0c20f9a1cc3c6)
@@ -32,4 +32,11 @@
 	[/uspace/lib/libc/bind%klog]
 	
+	bind ns:kbd to console:kbd;
+	bind ns:fb to console:fb;
+	bind ns:console to console:console;
+	bind ns:vfs to vfs:vfs;
+	bind ns:devmap_driver to devmap:devmap_driver;
+	bind ns:devmap_client to devmap:devmap_client;
+	
 	bind loader:ns to ns:ns;
 	
Index: contrib/arch/hadlbppp.py
===================================================================
--- contrib/arch/hadlbppp.py	(revision b988db0c0ee79f5bd7ba4be405e20796a2dce99c)
+++ contrib/arch/hadlbppp.py	(revision 7a53208993259654ee1ffae54fb0c20f9a1cc3c6)
@@ -42,5 +42,5 @@
 	"Print usage syntax"
 	
-	print "%s <--bp|--epb|--adl|--nop>+ <OUTPUT>" % prname
+	print "%s <--bp|--ebp|--adl|--nop>+ <OUTPUT>" % prname
 
 def tabs(cnt):
Index: contrib/arch/uspace/srv/console/console.adl
===================================================================
--- contrib/arch/uspace/srv/console/console.adl	(revision b988db0c0ee79f5bd7ba4be405e20796a2dce99c)
+++ contrib/arch/uspace/srv/console/console.adl	(revision 7a53208993259654ee1ffae54fb0c20f9a1cc3c6)
@@ -91,4 +91,6 @@
 	
 	delegate console to ui_dispatcher:console;
+	delegate kbd to kbd:kbd;
+	delegate fb to fb:fb;
 	
 	[/uspace/lib/libc/subsume%ui_dispatcher]
Index: contrib/arch/uspace/srv/ns/ns.adl
===================================================================
--- contrib/arch/uspace/srv/ns/ns.adl	(revision b988db0c0ee79f5bd7ba4be405e20796a2dce99c)
+++ contrib/arch/uspace/srv/ns/ns.adl	(revision 7a53208993259654ee1ffae54fb0c20f9a1cc3c6)
@@ -31,4 +31,10 @@
 		ns ns;
 	requires:
+		kbd kbd;
+		fb fb;
+		console console;
+		vfs vfs;
+		devmap_driver devmap_driver;
+		devmap_client devmap_client;
 		[/uspace/lib/libc/requires]
 	protocol:
Index: contrib/arch/uspace/srv/ns/ns.bp
===================================================================
--- contrib/arch/uspace/srv/ns/ns.bp	(revision b988db0c0ee79f5bd7ba4be405e20796a2dce99c)
+++ contrib/arch/uspace/srv/ns/ns.bp	(revision 7a53208993259654ee1ffae54fb0c20f9a1cc3c6)
@@ -11,5 +11,5 @@
 	?ipc_m_connect_me_to {
 		tentative {
-			alternative (service; kbd; fb; console; vfs; devmap) {
+			alternative (service; kbd; fb; console; vfs; devmap_driver; devmap_client) {
 				!service.ipc_m_connect_me_to /* forward */
 			}