diff --git a/recipes/pkg/flif_view/archives b/recipes/pkg/flif_view/archives
index 54e0cc0..e5c5107 100644
--- a/recipes/pkg/flif_view/archives
+++ b/recipes/pkg/flif_view/archives
@@ -1,4 +1,7 @@
 _/src/flif_view
+_/src/libc
 _/src/libflif
 _/src/libpng
+_/src/stdcxx
+_/src/vfs
 _/src/zlib
diff --git a/recipes/pkg/flif_view/hash b/recipes/pkg/flif_view/hash
index f073713..f9b3c12 100644
--- a/recipes/pkg/flif_view/hash
+++ b/recipes/pkg/flif_view/hash
@@ -1 +1 @@
-2018-01-10 a409d1e0f61f30fa68b6a412113c8756373cd60c
+18.05 4a21e700a1b61ba1945b286edc7c4355a014aa26
diff --git a/recipes/src/flif_view/hash b/recipes/src/flif_view/hash
index d9d0ff7..7415dd2 100644
--- a/recipes/src/flif_view/hash
+++ b/recipes/src/flif_view/hash
@@ -1 +1 @@
-2018-01-18 5604e84db8dd5ebfc84c7e743a5fb3b9a080a92a
+2018-06-02 03af05618b82ba6651eb9ebdcc84b4688ec7c705
diff --git a/recipes/src/libflif/hash b/recipes/src/libflif/hash
index 398c42d..6904b13 100644
--- a/recipes/src/libflif/hash
+++ b/recipes/src/libflif/hash
@@ -1 +1 @@
-2018-01-18 27afe64571626a3dd503fa285bddb48142b1e4d4
+2018-06-02 497ac377e232ac2dd4a048af37c5cad2bd094891
diff --git a/src/app/flif_view/flif_view.cc b/src/app/flif_view/flif_view.cc
index 9a0664b..8612650 100644
--- a/src/app/flif_view/flif_view.cc
+++ b/src/app/flif_view/flif_view.cc
@@ -235,17 +235,13 @@ struct Flif_view::Main
 	void handle_input_signal()
 	{
 		input.for_each_event([&] (Input::Event const &ev) {
-			if (ev.type() == Input::Event::PRESS) {
-				switch (ev.code()) {
-				case Input::KEY_PAGEDOWN:
-					++pending_page_index;
-					app_transmitter.submit();
-					break;
-				case Input::KEY_PAGEUP:
-					--pending_page_index;
-					app_transmitter.submit();
-					break;
-				}
+			if (ev.key_press(Input::KEY_PAGEDOWN)) {
+				++pending_page_index;
+				app_transmitter.submit();
+			} else
+			if (ev.key_press(Input::KEY_PAGEUP)) {
+				--pending_page_index;
+				app_transmitter.submit();
 			}
 		});
 	}