diff --git a/clearsilver/.footprint b/clearsilver/.footprint
index eea506128..580893ff8 100644
--- a/clearsilver/.footprint
+++ b/clearsilver/.footprint
@@ -36,9 +36,9 @@ drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libneo_cgi.a
 -rw-r--r--	root/root	usr/lib/libneo_cs.a
 -rw-r--r--	root/root	usr/lib/libneo_utl.a
-drwxr-xr-x	root/root	usr/lib/python/
-drwxr-xr-x	root/root	usr/lib/python/site-packages/
--rwxr-xr-x	root/root	usr/lib/python/site-packages/neo_cgi.so
+drwxr-xr-x	root/root	usr/lib/python2.5/
+drwxr-xr-x	root/root	usr/lib/python2.5/site-packages/
+-rwxr-xr-x	root/root	usr/lib/python2.5/site-packages/neo_cgi.so
 drwxr-xr-x	root/root	usr/man/
 drwxr-xr-x	root/root	usr/man/man3/
 -rw-r--r--	root/root	usr/man/man3/cBroadcast.3.gz
@@ -65,6 +65,7 @@ drwxr-xr-x	root/root	usr/man/man3/
 -rw-r--r--	root/root	usr/man/man3/cgi_url_escape.3.gz
 -rw-r--r--	root/root	usr/man/man3/cgi_url_escape_more.3.gz
 -rw-r--r--	root/root	usr/man/man3/cgi_url_unescape.3.gz
+-rw-r--r--	root/root	usr/man/man3/cgi_url_validate.3.gz
 -rw-r--r--	root/root	usr/man/man3/cgi_vredirect.3.gz
 -rw-r--r--	root/root	usr/man/man3/cgiwrap_getenv.3.gz
 -rw-r--r--	root/root	usr/man/man3/cgiwrap_init_emu.3.gz
@@ -151,7 +152,6 @@ drwxr-xr-x	root/root	usr/man/man3/
 -rw-r--r--	root/root	usr/man/man3/nerr_match.3.gz
 -rw-r--r--	root/root	usr/man/man3/nerr_pass.3.gz
 -rw-r--r--	root/root	usr/man/man3/nerr_pass_ctx.3.gz
--rw-r--r--	root/root	usr/man/man3/nerr_raise.3.gz
 -rw-r--r--	root/root	usr/man/man3/nerr_register.3.gz
 -rw-r--r--	root/root	usr/man/man3/skipDelete.3.gz
 -rw-r--r--	root/root	usr/man/man3/skipFreeList.3.gz
diff --git a/clearsilver/.md5sum b/clearsilver/.md5sum
index 79c7d0cc7..fdbc9aed0 100644
--- a/clearsilver/.md5sum
+++ b/clearsilver/.md5sum
@@ -1,2 +1 @@
-3fb39bf5335f6f977d92dea838409a11  clearsilver-0.10.4.patch
-9523df7ef17e41a01dbae5032a3e450b  clearsilver-0.10.4.tar.gz
+b8c0c7fbe0ef5e06e0c935f134304d44  clearsilver-0.10.5.tar.gz
diff --git a/clearsilver/Pkgfile b/clearsilver/Pkgfile
index f37f42b3c..d227a92fa 100644
--- a/clearsilver/Pkgfile
+++ b/clearsilver/Pkgfile
@@ -1,32 +1,26 @@
 # Description: Fast, powerful, and language-neutral HTML template system.
-# URL:         http://www.clearsilver.net/
-# Maintainer: unmaintained
-# Packager:    James Mills, prologic at shortcircuit dot net dot au
-#
-# Depends on:  python
+# URL: http://www.clearsilver.net/
+# Maintainer: Danny Rawlins, monster dot romster at gmail dot com
+# Packager: James Mills, prologic at shortcircuit dot net dot au
+# Depends on: python
 
 name=clearsilver
-version=0.10.4
-release=2
-source=(http://www.clearsilver.net/downloads/$name-$version.tar.gz \
-   $name-$version.patch)
+version=0.10.5
+release=1
+source=(http://www.clearsilver.net/downloads/clearsilver-$version.tar.gz)
 
-build () {
-   cd $name-$version
+build() {
+	cd clearsilver-$version
 
-   patch -p1 < $SRC/$name-$version.patch
+	./configure \
+		--prefix=/usr \
+		--disable-perl \
+		--disable-ruby \
+		--disable-java \
+		--disable-csharp \
+		--with-python=/usr/bin/python
 
-   ./configure \
-      --prefix=$PKG/usr \
-      --with-python=/usr/bin/python \
-      --disable-perl \
-      --disable-ruby \
-      --disable-java \
-      --disable-csharp
-
-   make && make prefix=$PKG/usr \
-      PYTHON_SITE=$PKG/usr/lib/python$pythonver/site-packages/ \
-      install
-
-   chown root:root $PKG
+	make
+	make DESTDIR=$PKG install
 }
+
diff --git a/clearsilver/clearsilver-0.10.1-patch b/clearsilver/clearsilver-0.10.1-patch
deleted file mode 100644
index 5178563ac..000000000
--- a/clearsilver/clearsilver-0.10.1-patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -pruN clearsilver-0.10.1-orig/scripts/document.py clearsilver-0.10.1/scripts/document.py
---- clearsilver-0.10.1-orig/scripts/document.py	2005-08-02 01:30:42.000000000 +1000
-+++ clearsilver-0.10.1/scripts/document.py	2005-08-02 01:31:08.000000000 +1000
-@@ -1,4 +1,4 @@
--#!/bin/env python
-+#!/usr/bin/env python
- """
-   document.py -- Simple script to generate manpages from C header
-   files.  Looks for the following formatted C comments in the C header files:
diff --git a/clearsilver/clearsilver-0.10.3-patch b/clearsilver/clearsilver-0.10.3-patch
deleted file mode 100644
index 5178563ac..000000000
--- a/clearsilver/clearsilver-0.10.3-patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -pruN clearsilver-0.10.1-orig/scripts/document.py clearsilver-0.10.1/scripts/document.py
---- clearsilver-0.10.1-orig/scripts/document.py	2005-08-02 01:30:42.000000000 +1000
-+++ clearsilver-0.10.1/scripts/document.py	2005-08-02 01:31:08.000000000 +1000
-@@ -1,4 +1,4 @@
--#!/bin/env python
-+#!/usr/bin/env python
- """
-   document.py -- Simple script to generate manpages from C header
-   files.  Looks for the following formatted C comments in the C header files:
diff --git a/clearsilver/clearsilver-0.10.4.patch b/clearsilver/clearsilver-0.10.4.patch
deleted file mode 100644
index d7ac17e2d..000000000
--- a/clearsilver/clearsilver-0.10.4.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -pruN clearsilver-0.10.4-orig/scripts/document.py clearsilver-0.10.1/scripts/document.py
---- clearsilver-0.10.4-orig/scripts/document.py	2005-08-02 01:30:42.000000000 +1000
-+++ clearsilver-0.10.4/scripts/document.py	2005-08-02 01:31:08.000000000 +1000
-@@ -1,4 +1,4 @@
--#!/bin/env python
-+#!/usr/bin/env python
- """
-   document.py -- Simple script to generate manpages from C header
-   files.  Looks for the following formatted C comments in the C header files: