diff --git a/fn-handle/Makefile b/fn-handle/Makefile
new file mode 100644
index 0000000..3a255f1
--- /dev/null
+++ b/fn-handle/Makefile
@@ -0,0 +1,47 @@
+#
+# Copyright (C) 2009 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=fn-handle
+PKG_VERSION:=20091118
+PKG_REV:=a5903ed490cc104c9f3e9270c542e6cdacb4b069
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=git://projects.qi-hardware.com/fn-handle.git
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=$(PKG_REV)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/fn-handle
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=Vido
+  URL:=http://projects.qi-hardware.com/index.php/f/fn-handle/
+endef
+
+define Build/Configure
+endef
+
+define Package/fn-handle/install
+	$(INSTALL_DIR) \
+		$(1)/etc/init.d \
+		$(1)/usr/bin
+
+	$(INSTALL_BIN) \
+		$(PKG_BUILD_DIR)/fnkeys \
+		$(1)/usr/bin/
+
+	$(INSTALL_BIN) \
+		./files/$(PKG_NAME).init \
+		$(1)/etc/init.d/
+endef
+
+$(eval $(call BuildPackage,fn-handle))
diff --git a/fn-handle/files/fn-handle.init b/fn-handle/files/fn-handle.init
new file mode 100755
index 0000000..a1eb3b8
--- /dev/null
+++ b/fn-handle/files/fn-handle.init
@@ -0,0 +1,11 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2008 OpenWrt.org
+START=40
+
+start() {
+	fn-handle
+}
+
+stop() {
+	killall fn-handle
+}
diff --git a/ncmpc/Makefile b/ncmpc/Makefile
index 96edd7f..46fef70 100644
--- a/ncmpc/Makefile
+++ b/ncmpc/Makefile
@@ -20,6 +20,15 @@ PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
+TARGET_CFLAGS+= \
+	-I$(STAGING_DIR)/usr/lib/libintl/include \
+	-I$(STAGING_DIR)/usr/libiconv/include
+
+TARGET_LDFLAGS+= \
+	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
+	-L$(STAGING_DIR)/usr/lib/libintl/lib \
+	-L$(STAGING_DIR)/usr/lib/libiconv/lib
+
 define Package/ncmpc
     TITLE:=ncmpc
     SECTION:=sound