diff --git a/libs/clearsilver/Makefile b/libs/clearsilver/Makefile
new file mode 100644
index 000000000..f5cc23ea5
--- /dev/null
+++ b/libs/clearsilver/Makefile
@@ -0,0 +1,114 @@
+#
+# Copyright (C) 2007 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:=clearsilver
+PKG_VERSION:=0.10.5
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://www.clearsilver.net/downloads/
+PKG_MD5SUM:=b8c0c7fbe0ef5e06e0c935f134304d44
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/clearsilver
+  SECTION:=libs
+  CATEGORY:=Libraries
+  DEPENDS:=+neon +zlib
+  TITLE:=ClearSilver template system
+  DESCRIPTION:=Clearsilver is a fast, powerful, and language-neutral HTML template system. In both static content sites and dynamic HTML applications, it provides a separation between presentation code and application logic which makes working with your project easier.
+	URL:=http://www.clearsilver.net/
+endef
+
+CONFIGURE_ARGS += \
+  --disable-wdb \
+  --disable-apache \
+  --disable-python \
+  --disable-perl \
+  --disable-ruby \
+  --disable-java \
+  --disable-csharp \
+  --prefix=/usr
+
+MAKE_FLAGS += \
+	$(TARGET_CONFIGURE_OPTS) \
+	AR="$(AR) cr" \
+	LD="$(TARGET_CROSS)ld -o" \
+	DESTDIR="$(PKG_INSTALL_DIR)" \
+	all install
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(STAGING_DIR)/usr/include/ClearSilver
+	$(INSTALL_DIR) $(STAGING_DIR)/usr/include/ClearSilver/cs
+	$(INSTALL_DIR) $(STAGING_DIR)/usr/include/ClearSilver/cgi
+	$(INSTALL_DIR) $(STAGING_DIR)/usr/include/ClearSilver/util
+
+	$(CP) $(PKG_BUILD_DIR)/ClearSilver.h $(STAGING_DIR)/usr/include/ClearSilver/
+	$(CP) $(PKG_BUILD_DIR)/cs_config.h $(STAGING_DIR)/usr/include/ClearSilver/
+
+	$(CP) $(PKG_BUILD_DIR)/cs/cs.h $(STAGING_DIR)/usr/include/ClearSilver/cs/
+
+	$(CP) $(PKG_BUILD_DIR)/cgi/cgi.h $(STAGING_DIR)/usr/include/ClearSilver/cgi/
+	$(CP) $(PKG_BUILD_DIR)/cgi/cgiwrap.h $(STAGING_DIR)/usr/include/ClearSilver/cgi/
+	$(CP) $(PKG_BUILD_DIR)/cgi/date.h $(STAGING_DIR)/usr/include/ClearSilver/cgi/
+	$(CP) $(PKG_BUILD_DIR)/cgi/html.h $(STAGING_DIR)/usr/include/ClearSilver/cgi/
+
+	$(CP) $(PKG_BUILD_DIR)/util/neo_err.h $(STAGING_DIR)/usr/include/ClearSilver/util/
+	$(CP) $(PKG_BUILD_DIR)/util/neo_files.h $(STAGING_DIR)/usr/include/ClearSilver/util/
+	$(CP) $(PKG_BUILD_DIR)/util/neo_misc.h $(STAGING_DIR)/usr/include/ClearSilver/util/
+	$(CP) $(PKG_BUILD_DIR)/util/neo_rand.h $(STAGING_DIR)/usr/include/ClearSilver/util/
+	$(CP) $(PKG_BUILD_DIR)/util/ulist.h $(STAGING_DIR)/usr/include/ClearSilver/util/
+	$(CP) $(PKG_BUILD_DIR)/util/neo_hdf.h $(STAGING_DIR)/usr/include/ClearSilver/util/
+	$(CP) $(PKG_BUILD_DIR)/util/neo_str.h $(STAGING_DIR)/usr/include/ClearSilver/util/
+	$(CP) $(PKG_BUILD_DIR)/util/neo_date.h $(STAGING_DIR)/usr/include/ClearSilver/util/
+	$(CP) $(PKG_BUILD_DIR)/util/wildmat.h $(STAGING_DIR)/usr/include/ClearSilver/util/
+	$(CP) $(PKG_BUILD_DIR)/util/neo_hash.h $(STAGING_DIR)/usr/include/ClearSilver/util/
+	$(CP) $(PKG_BUILD_DIR)/util/ulocks.h $(STAGING_DIR)/usr/include/ClearSilver/util/
+	$(CP) $(PKG_BUILD_DIR)/util/rcfs.h $(STAGING_DIR)/usr/include/ClearSilver/util/
+	$(CP) $(PKG_BUILD_DIR)/util/skiplist.h $(STAGING_DIR)/usr/include/ClearSilver/util/
+	$(CP) $(PKG_BUILD_DIR)/util/dict.h $(STAGING_DIR)/usr/include/ClearSilver/util/
+	$(CP) $(PKG_BUILD_DIR)/util/filter.h $(STAGING_DIR)/usr/include/ClearSilver/util/
+	$(CP) $(PKG_BUILD_DIR)/util/neo_net.h $(STAGING_DIR)/usr/include/ClearSilver/util/
+	$(CP) $(PKG_BUILD_DIR)/util/neo_server.h $(STAGING_DIR)/usr/include/ClearSilver/util/
+
+	$(INSTALL_DIR) $(STAGING_DIR)/usr/lib
+
+	$(CP) $(PKG_BUILD_DIR)/libs/libneo_cs.a $(STAGING_DIR)/usr/lib/
+	$(CP) $(PKG_BUILD_DIR)/libs/libneo_cgi.a $(STAGING_DIR)/usr/lib/
+	$(CP) $(PKG_BUILD_DIR)/libs/libneo_utl.a $(STAGING_DIR)/usr/lib/
+
+	$(INSTALL_DIR) $(STAGING_DIR)/usr/bin
+
+	$(CP) $(PKG_BUILD_DIR)/cs/cs $(STAGING_DIR)/usr/bin/
+	$(CP) $(PKG_BUILD_DIR)/cs/cstest $(STAGING_DIR)/usr/bin/
+	$(CP) $(PKG_BUILD_DIR)/cgi/cs_static.cgi $(STAGING_DIR)/usr/bin/
+endef
+
+define Build/UninstallDev
+	rm -rf \
+		$(STAGING_DIR)/usr/include/ClearSilver \
+		$(STAGING_DIR)/usr/lib/libneo_* \
+		$(STAGING_DIR)/usr/bin/cs \
+		$(STAGING_DIR)/usr/bin/cstest \
+		$(STAGING_DIR)/usr/bin/cs_static.cgi
+endef
+
+define Package/clearsilver/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libs/libneo_cs.a $(1)/usr/lib/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libs/libneo_cgi.a $(1)/usr/lib/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libs/libneo_utl.a $(1)/usr/lib/
+	
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/cs/cs $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/cs/cstest $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/cgi/cs_static.cgi $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,clearsilver))
diff --git a/libs/clearsilver/patches/001-gcc-vs-dollar-cc.patch b/libs/clearsilver/patches/001-gcc-vs-dollar-cc.patch
new file mode 100644
index 000000000..1acc30b04
--- /dev/null
+++ b/libs/clearsilver/patches/001-gcc-vs-dollar-cc.patch
@@ -0,0 +1,11 @@
+--- clearsilver-0.10.5/rules.mk.in	2006-12-19 05:39:58.000000000 +0100
++++ clearsilver-0.10.5/rules.mk.in.new	2007-07-18 10:53:52.000000000 +0200
+@@ -158,7 +158,7 @@
+ 	@touch Makefile.depends
+ 	@if test "x" != "x$(SOURCE_FILES)"; then \
+ 	  for II in "$(SOURCE_FILES)"; do \
+-		gcc -M -MG ${CFLAGS} $$II >> Makefile.depends; \
++		$(CC) -M -MG ${CFLAGS} $$II >> Makefile.depends; \
+ 	  done; \
+ 	 fi
+ 	@echo "** (done) "
diff --git a/libs/clearsilver/patches/003-disable-tests.patch b/libs/clearsilver/patches/003-disable-tests.patch
new file mode 100644
index 000000000..c95a264d8
--- /dev/null
+++ b/libs/clearsilver/patches/003-disable-tests.patch
@@ -0,0 +1,12 @@
+diff -ur clearsilver-0.10.5/cs/Makefile clearsilver-0.10.5_new/cs/Makefile
+--- clearsilver-0.10.5/cs/Makefile	2007-07-18 11:11:30.000000000 +0200
++++ clearsilver-0.10.5_new/cs/Makefile	2007-07-18 11:21:21.000000000 +0200
+@@ -24,7 +24,7 @@
+ 
+ LIBS += -lneo_cs -lneo_utl #  -lefence
+ 
+-TARGETS = $(CS_LIB) $(CSTEST_EXE) $(CSR_EXE) test
++TARGETS = $(CS_LIB) $(CSTEST_EXE) $(CSR_EXE) # test
+ 
+ CS_TESTS = test.cs test2.cs test3.cs test4.cs test5.cs test6.cs test7.cs \
+            test8.cs test9.cs test10.cs test11.cs test12.cs test13.cs \