diff --git a/fbterm/Makefile b/fbterm/Makefile
index b117323..e6f8f3e 100644
--- a/fbterm/Makefile
+++ b/fbterm/Makefile
@@ -22,7 +22,7 @@ define Package/fbterm
   TITLE:=FbTerm, a fast FrameBuffer based TERMinal emulator for linux
   URL:=http://code.google.com/p/fbterm/
   SUBMENU:=Terminal
-  DEPENDS:=+libiconv +fontconfig
+  DEPENDS:=+libiconv +fontconfig +unifont
 endef
 
 define Package/fbterm/description
diff --git a/jfbterm/Makefile b/jfbterm/Makefile
index 9d1f7ec..ccf7a7d 100644
--- a/jfbterm/Makefile
+++ b/jfbterm/Makefile
@@ -23,7 +23,7 @@ define Package/jfbterm
   TITLE:=J framebuffer terminal / Multilingual Enhancement
   URL:=http://jfbterm.sourceforge.jp
   SUBMENU:=Terminal
-  DEPENDS:=+libiconv
+  DEPENDS:=+libiconv +unifont
 endef
 
 define Package/jfbterm/description
diff --git a/jfbterm/config/jfbterm.conf b/jfbterm/config/jfbterm.conf
index 12fa086..387f971 100644
--- a/jfbterm/config/jfbterm.conf
+++ b/jfbterm/config/jfbterm.conf
@@ -39,7 +39,7 @@ term		:	xterm-color
 #+fontset: iso8859.13-1998,pcf,R,/usr/share/fonts/jfbterm/8x13-ISO8859-13.pcf.gz
 #+fontset: iso8859.14-1998,pcf,R,/usr/share/fonts/jfbterm/8x13-ISO8859-14.pcf.gz
 #+fontset: iso8859.15-1999,pcf,R,/usr/share/fonts/jfbterm/8x13-ISO8859-15.pcf.gz
-fontset: iso10646.1,pcf,U,/usr/share/fonts/jfbterm/unifont.pcf.gz
+fontset: iso10646.1,pcf,U,/usr/share/fonts/unifont.pcf.gz
 #+fontset: vt100-graphics,pcf,L,/usr/share/fonts/jfbterm/vt100-graphics.pcf.gz
 #+fontset: iso8859.1-1987,pcf,R,/usr/share/fonts/jfbterm/8x16.pcf.gz
 
@@ -49,7 +49,7 @@ fontset: iso10646.1,pcf,U,/usr/share/fonts/jfbterm/unifont.pcf.gz
 #	Encoding configuration 
 #
 ###############################################################################
-encoding : locale
+encoding : UTF-8
 
 #encoding.C     : G0,G1,ansix3.4-1968,ansix3.4-1968,iso8859.1-1987,ansix3.4-1968
 #encoding.POSIX : G0,G1,ansix3.4-1968,ansix3.4-1968,iso8859.1-1987,ansix3.4-1968
diff --git a/jfbterm/fonts/unifont.pcf.gz b/jfbterm/fonts/unifont.pcf.gz
deleted file mode 100644
index 3a1bb09..0000000
Binary files a/jfbterm/fonts/unifont.pcf.gz and /dev/null differ
diff --git a/unifont/Makefile b/unifont/Makefile
new file mode 100644
index 0000000..1f95dab
--- /dev/null
+++ b/unifont/Makefile
@@ -0,0 +1,43 @@
+# 
+# OpenWrt
+#
+# This is free software, licensed under the GNU General Public License v2.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=unifont
+PKG_VERSION:=5.1.20080820
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).pcf.gz
+PKG_SOURCE_URL:=http://unifoundry.com/
+PKG_MD5SUM:=8c28087c5fcb3188f1244b390efffdbe
+
+include $(INCLUDE_DIR)/package.mk
+PKG_UNPACK:=$(CP) $(DL_DIR)/$(PKG_SOURCE) $(PKG_BUILD_DIR)
+
+define Package/unifont
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=GNU Unifont
+  URL:=http://unifoundry.com/unifont.html
+endef
+
+define Package/unifont/description
+  GNU Unifont, with glyphs for every printable code point in the Unicode 5.1 Basic Multilingual Plane (BMP).
+endef
+
+define Build/Compile
+endef
+
+define Package/unifont/install
+	$(INSTALL_DIR) \
+		$(1)/usr/share/fonts
+
+	$(INSTALL_DATA) \
+		$(PKG_BUILD_DIR)/$(PKG_SOURCE) \
+		$(1)/usr/share/fonts/unifont.pcf.gz
+endef
+
+$(eval $(call BuildPackage,unifont))