diff --git a/src/server/input_normalizer/README b/src/server/input_normalizer/README
index 26719a8..3d95364 100644
--- a/src/server/input_normalizer/README
+++ b/src/server/input_normalizer/README
@@ -1,6 +1,6 @@
-This component normalizes the submission of input events into
-periodic bursts, nullifying user behavior profiling based on
-input timing.
+This component partitions the submission of key presses
+into periodic bursts, nullifying user behavior profiling
+based on keyboard input timing.
 
 It can be configured with the 'period_ms' attribute on the
 config node. The default is 200 milliseconds.
@@ -17,7 +17,7 @@ An example of injecting delay into VirtualBox:
 ! 	</start>
 !
 ! 	<start name="input_normalizer">
-! 		<resource name="RAM" quantum="2M" />
+! 		<resource name="RAM" quantum="1M" />
 ! 		<provides>
 ! 			<service name="Input" />
 ! 		</provides>
diff --git a/src/server/input_normalizer/main.cc b/src/server/input_normalizer/main.cc
index 33ee788..90b1e04 100644
--- a/src/server/input_normalizer/main.cc
+++ b/src/server/input_normalizer/main.cc
@@ -15,11 +15,12 @@
 /* Genode includes */
 #include <timer_session/connection.h>
 #include <input/component.h>
+#include <input/event_queue.h>
 #include <input_session/connection.h>
-#include <os/attached_dataspace.h>
-#include <os/config.h>
-#include <os/server.h>
 #include <os/static_root.h>
+#include <base/component.h>
+#include <base/attached_rom_dataspace.h>
+#include <base/attached_dataspace.h>
 
 namespace Input_normalizer {
 	using namespace Genode;
@@ -32,86 +33,102 @@ namespace Input_normalizer {
 
 struct Input_normalizer::Main
 {
-	Server::Entrypoint &ep;
+	Genode::Env &env;
 
-	/*
-	 * Input session provided by our parent
-	 */
-	Input::Session_client parent_input
-		{ env()->parent()->session<Input::Session>("ram_quota=16K") };
-	Attached_dataspace input_dataspace { parent_input.dataspace() };
-
-	/*
-	 * Input session provided to our client
-	 */
-	Input::Session_component input_session_component;
-
-	/*
-	 * Attach root interface to the entry point
-	 */
-	Static_root<Input::Session> input_root { ep.manage(input_session_component) };
-
-	/*
-	 * Timer session for event timing
-	 */
-	Timer::Connection timer;
-
-	void flush_input(unsigned)
+	unsigned config_period_ms()
 	{
-		Input::Event const * const events =
-			input_dataspace.local_addr<Input::Event>();
+		enum { DEFAULT_PERIOD_MS = 200 };
+		unsigned value = DEFAULT_PERIOD_MS;
 
-		unsigned const num = parent_input.flush();
-		for (unsigned i = 0; i < num; i++)
-			input_session_component.submit(events[i]);
+		try {
+			Attached_rom_dataspace config { env, "config" };
+			config.xml().attribute("period_ms").value(&value);
+		} catch (...) { }
+		return value;
 	}
 
-	Signal_rpc_member<Main> timer_dispatcher =
-		{ ep, *this, &Main::flush_input };
+	unsigned const period_us = config_period_ms() * 1000;
+
+	/* input session provided by our parent  */
+	Input::Connection parent_input { env };
+
+	/* input session provided to our client  */
+	Input::Session_component client_input { env, env.ram() };
+
+	Input::Event_queue &queue = client_input.event_queue();
+
+	/*  attach root interface to the entry point */
+	Static_root<Input::Session> input_root
+		{ env.ep().manage(client_input) };
+
+	/* Timer session for delaying events */
+	Timer::Connection timer { env };
+
+	enum { STAY_ACTIVE = 10 };
+	int timer_active = 0;
+
+	/* signaled by input */
+	void handle_input()
+	{
+		using namespace Input;
+
+		/* forward the queue */
+		parent_input.for_each_event([&] (Event const &e) {
+			/*
+			 * laggy pointing is upleasant, so signal the client if
+			 * there is anything other than button presses queued,
+			 * otherwise notify the client when the timer fires
+			 */
+			queue.add(e, (e.type() != Event::PRESS) && (e.type() != Event::RELEASE));
+		});
+
+		if (timer_active < 1) /* wake up the timer */
+			timer.trigger_periodic(period_us);
+
+		timer_active = STAY_ACTIVE;
+	}
+
+	Signal_handler<Main> input_handler =
+		{ env.ep(), *this, &Main::handle_input };
+
+	/* signaled by timer */
+	void handle_timer()
+	{
+		if (queue.empty()) {
+			--timer_active;
+			/* stop the timer if nothing is happening */
+			if (timer_active < 1)
+				timer.trigger_periodic(0);
+		} else
+			queue.submit_signal();
+	}
+
+	Signal_handler<Main> timer_handler =
+		{ env.ep(), *this, &Main::handle_timer };
 
 	/**
 	 * Constructor
 	 */
-	Main(Server::Entrypoint &ep) : ep(ep)
+	Main(Genode::Env &env) : env(env)
 	{
-		input_session_component.event_queue().enabled(true);
+		queue.enabled(true);
 
-		/*
-		 * Get period from config
-		 */
-		enum { DEFAULT_PERIOD_MS = 200 };
-		unsigned period_ms = DEFAULT_PERIOD_MS;
-		period_ms = config()->xml_node().attribute_value("period_ms", period_ms);
+		/* register input handler */
+		parent_input.sigh(input_handler);
 
-		/*
-		 * Register timeout handler
-		 */
-		timer.sigh(timer_dispatcher);
-		timer.trigger_periodic(period_ms*1000); /* convert to microseconds */
+		/* register timeout handler */
+		timer.sigh(timer_handler);
 
-		/*
-		 * Announce service
-		 */
-		Genode::env()->parent()->announce(ep.manage(input_root));
+		/* announce service */
+		env.parent().announce(env.ep().manage(input_root));
 	}
-
-	~Main()
-	{
-		env()->parent()->close(parent_input);
-	}
-
 };
 
 
-/************
- ** Server **
- ************/
+/***************
+ ** Component **
+ ***************/
 
-namespace Server {
+Genode::size_t Component::stack_size() { return 4*1024*sizeof(Genode::addr_t); }
 
-	char const *name() { return "input_normalizer_ep"; }
-
-	size_t stack_size() { return 4*1024*sizeof(addr_t); }
-
-	void construct(Entrypoint &ep) { static Input_normalizer::Main inst(ep); }
-}
+void Component::construct(Genode::Env &env) { static Input_normalizer::Main inst(env); }
diff --git a/src/server/input_normalizer/target.mk b/src/server/input_normalizer/target.mk
index 7fd6132..1a0bc74 100644
--- a/src/server/input_normalizer/target.mk
+++ b/src/server/input_normalizer/target.mk
@@ -1,3 +1,3 @@
 TARGET = input_normalizer
 SRC_CC = main.cc
-LIBS   = base config server
+LIBS   = base