diff --git a/guile2/Makefile b/guile2/Makefile
new file mode 100644
index 0000000..75ae7a8
--- /dev/null
+++ b/guile2/Makefile
@@ -0,0 +1,89 @@
+#
+# Copyright (C) 2009 Qi Hardware Inc.
+# Author: Xiangfu Liu <xiangfu@qi-hardware.com>
+# 
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+# modified 16/08/2010
+# author: jmoore@zedstar.org
+
+
+# modified 20/02/2012
+# author: jnbagale@gmail.com
+
+# install the "guile 2" in your HOST pc for compile this package
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=guile
+PKG_VERSION:=2.0.5
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://ftp.gnu.org/gnu/guile/
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
+
+define Package/guile2
+    MAINTAINER:="Xiangfu Liu" <xiangfu@sharism.cc>
+    TITLE:=guile2
+    SECTION:=lang
+    CATEGORY:=Languages
+    DEPENDS:=+libgmp +libpthread +libltdl +libncurses +libreadline +libffi +libunistring +gc
+    URL:=http://savannah.gnu.org/projects/guile/
+endef
+
+define Package/guile2/description
+    GNU Guile is an interpreter for Scheme, packaged as a library that you can link into your applications to give them their own scripting language.
+endef
+
+# should fix issue with threads
+CONFIGURE_ARGS += --with-libgmp-prefix --with-libunistring-prefix --with-libltdl-prefix 
+CONFIGURE_VARS += gl_cv_func_duplocale_works=yes guile_cv_use_csqrt="no, Ben NanoNote (cross-compiling)"
+
+define Build/InstallDev
+	$(INSTALL_DIR) \
+		$(1)/usr/include \
+		$(1)/usr/lib \
+		$(1)/usr/lib/pkgconfig
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/* \
+		$(1)/usr/lib/
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/include/* \
+		$(1)/usr/include/
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig \
+		$(1)/usr/lib/
+endef
+
+define Package/guile2/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/lib/guile/2.0
+	$(INSTALL_DIR) $(1)/usr/share/guile/2.0
+
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/bin/* \
+		$(1)/usr/bin/
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/libguile*.so* \
+		$(1)/usr/lib/
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/guile/2.0/* \
+		$(1)/usr/lib/guile/2.0/
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/share/guile/2.0/* \
+		$(1)/usr/share/guile/2.0/
+
+endef
+
+$(eval $(call RequireCommand,guile,$(PKG_NAME) requires guile on the host system.))
+$(eval $(call BuildPackage,guile2))
diff --git a/guile2/patches/0001-disable_gnu_locale_api.patch b/guile2/patches/0001-disable_gnu_locale_api.patch
new file mode 100644
index 0000000..24422be
--- /dev/null
+++ b/guile2/patches/0001-disable_gnu_locale_api.patch
@@ -0,0 +1,11 @@
+--- guile-2.0.2/libguile/i18n.c	2011-08-12 16:47:52.538234245 +0200
++++ guile-2.0.2m/libguile/i18n.c	2011-08-12 16:47:11.027419164 +0200
+@@ -865,7 +865,7 @@
+   *dst = '\0';
+ }
+ 
+-#ifdef USE_GNU_LOCALE_API
++#ifdef USE_GNU_LOCALE_API_DISABLED
+ static inline void
+ str_upcase_l (register char *dst, register const char *src,
+ 	      scm_t_locale locale)
diff --git a/libunistring/Makefile b/libunistring/Makefile
index 4dbb903..231901d 100644
--- a/libunistring/Makefile
+++ b/libunistring/Makefile
@@ -6,10 +6,13 @@
 # See /LICENSE for more information.
 #
 
+# modified 20/02/2012
+# author: jnbagale@gmail.com
+
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libunistring
-PKG_VERSION:=0.9.2.1
+PKG_VERSION:=0.9.3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://ftp.gnu.org/gnu/$(PKG_NAME)/
@@ -17,13 +20,14 @@ PKG_SOURCE_URL:=http://ftp.gnu.org/gnu/$(PKG_NAME)/
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/libunistring
     MAINTAINER:="Bart van Strien" <bart.bes@gmail.com>
     TITLE:=libunistring
     SECTION:=libs
     CATEGORY:=Libraries
-    DEPENDS:=+libiconv
+    DEPENDS:=$(ICONV_DEPENDS)
     URL:=http://savannah.gnu.org/projects/libunistring/
 endef