diff --git a/.cvsignore b/.cvsignore
index fdaf58d..fbe4ba9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-clearsilver-0.10.4.tar.gz
+clearsilver-0.10.5.tar.gz
diff --git a/clearsilver-0.10.2-fedora.patch b/clearsilver-0.10.2-fedora.patch
deleted file mode 100644
index b76b50d..0000000
--- a/clearsilver-0.10.2-fedora.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff -Nur clearsilver-0.10.2.orig/cgi/cgi.c clearsilver-0.10.2/cgi/cgi.c
---- clearsilver-0.10.2.orig/cgi/cgi.c	2005-12-02 10:34:04.000000000 +0100
-+++ clearsilver-0.10.2/cgi/cgi.c	2005-12-15 20:45:13.000000000 +0100
-@@ -641,7 +641,7 @@
- 
-   if ((debugger = hdf_get_value (cgi->hdf, "Config.Debugger", NULL)) == NULL)
-   {
--    debugger = "/usr/local/bin/sudo /usr/local/bin/ddd -display %s %s %d";
-+    debugger = "/usr/bin/sudo /usr/local/bin/ddd -display %s %s %d";
-   }
- 
-   if (!pid)
-diff -Nur clearsilver-0.10.2.orig/configure clearsilver-0.10.2/configure
---- clearsilver-0.10.2.orig/configure	2005-12-15 01:26:08.000000000 +0100
-+++ clearsilver-0.10.2/configure	2005-12-15 20:56:46.000000000 +0100
-@@ -6002,7 +6002,7 @@
-   echo "$as_me:$LINENO: checking for python includes" >&5
- echo $ECHO_N "checking for python includes... $ECHO_C" >&6
-   python_inc=no
--  python_search_path="/neo/opt /usr/local /usr /c"
-+  python_search_path="/usr"
-   python_versions="2.4 2.3 2.2 2.1 2.0 1.5 24 23 22 21 20 15"
-   if test $cs_cv_python_path != "no" -a -x $cs_cv_python_path; then
-     python_bin=$cs_cv_python_path
-@@ -6023,7 +6023,7 @@
- 	  python_site=$path/lib/python$vers/site-packages
- 	  break 2
- 	fi
--			if test -f $path/python$vers/include/Python.h; then
-+	if test -f $path/python$vers/include/Python.h; then
- 	  python_inc=$path/python$vers/include
- 	  python_lib="-L$path/python$vers/libs -lpython$vers"
- 	  python_site=$path/python$vers/Lib/site-packages
-@@ -6034,14 +6034,14 @@
-   fi
-   if test "x$python_inc" = "xno"; then
-     echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+    echo "${ECHO_T}not found" >&6
-     PYTHON=
-     PYTHON_INC=
-     PYTHON_LIB=
-     PYTHON_SITE=
-   else
-     echo "$as_me:$LINENO: result: found $python_inc" >&5
--echo "${ECHO_T}found $python_inc" >&6
-+    echo "${ECHO_T}found $python_inc" >&6
-     PYTHON=$python_bin
-     PYTHON_INC="-I$python_inc"
-     PYTHON_LIB=$python_lib
-@@ -6050,6 +6050,7 @@
-     fi
-     BUILD_WRAPPERS="$BUILD_WRAPPERS python"
-   fi
-+  PYTHON_SITE=`$python_bin -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)"`
- fi
- 
- cs_cv_perl=yes
-@@ -6278,7 +6279,8 @@
- done
- _ACJNI_FOLLOWED="$_cur"
- 
--_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[^/]*$::'`
-+#_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[^/]*$::'`
-+_JTOPDIR="$java_path"
- case "$host_os" in
-         darwin*)        _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[^/]*$::'`
-                         _JINC="$_JTOPDIR/Headers";;
-diff -Nur clearsilver-0.10.2.orig/imd/imdm.py clearsilver-0.10.2/imd/imdm.py
---- clearsilver-0.10.2.orig/imd/imdm.py	2005-06-30 20:51:54.000000000 +0200
-+++ clearsilver-0.10.2/imd/imdm.py	2005-12-15 20:45:14.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/python
-+#!/usr/bin/python
- #
- # imdm
- # 
-diff -Nur clearsilver-0.10.2.orig/java-jni/Makefile clearsilver-0.10.2/java-jni/Makefile
---- clearsilver-0.10.2.orig/java-jni/Makefile	2005-12-02 11:35:28.000000000 +0100
-+++ clearsilver-0.10.2/java-jni/Makefile	2005-12-15 20:45:13.000000000 +0100
-@@ -37,14 +37,14 @@
- org_clearsilver_CS.h: $(NEO_UTIL_JAVA_JAR)
- 	$(JAVAH) -classpath $(NEO_UTIL_JAVA_JAR) -jni org.clearsilver.CS
- 
--CSTest.class: CSTest.java
-+CSTest.class: CSTest.java $(NEO_UTIL_JAVA_JAR)
- 	$(JAVAC) -classpath $(NEO_UTIL_JAVA_JAR) CSTest.java
- 
- gold: CSTest.class
- 	@/bin/sh -c "LD_LIBRARY_PATH=$(NEOTONIC_ROOT)/java-jni; export LD_LIBRARY_PATH; CLASSPATH=$(NEO_UTIL_JAVA_JAR):.; export CLASSPATH; $(JAVA_PATH)/bin/java CSTest" > javatest.gold
- 	@echo "Generated gold files"
- 
--test: CSTest.class
-+test: CSTest.class $(NEO_UTIL_SO)
- 	@echo "Running java test"
- 	@failed=0; \
- 	rm -f javatest.out; \
-diff -Nur clearsilver-0.10.2.orig/ruby/Makefile clearsilver-0.10.2/ruby/Makefile
---- clearsilver-0.10.2.orig/ruby/Makefile	2005-12-02 11:35:52.000000000 +0100
-+++ clearsilver-0.10.2/ruby/Makefile	2005-12-15 20:45:14.000000000 +0100
-@@ -41,7 +41,7 @@
- 
- 
- install: all
--	$(RUBY) install.rb install
-+	$(RUBY) install.rb install --prefix=$(DESTDIR)
- 
- clean:
- 	$(RM) ext/hdf/*.o ext/hdf/*.so
-diff -Nur clearsilver-0.10.2.orig/scripts/document.py clearsilver-0.10.2/scripts/document.py
---- clearsilver-0.10.2.orig/scripts/document.py	2005-07-28 02:53:10.000000000 +0200
-+++ clearsilver-0.10.2/scripts/document.py	2005-12-15 20:45:14.000000000 +0100
-@@ -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-0.10.5-fedora.patch b/clearsilver-0.10.5-fedora.patch
new file mode 100644
index 0000000..2e0ba6e
--- /dev/null
+++ b/clearsilver-0.10.5-fedora.patch
@@ -0,0 +1,80 @@
+diff --git a/cgi/cgi.c b/cgi/cgi.c
+index 5be9afe..5c8cf8d 100644
+--- a/cgi/cgi.c
++++ b/cgi/cgi.c
+@@ -503,7 +503,7 @@ static void _launch_debugger (CGI *cgi, char *display)
+ 
+   if ((debugger = hdf_get_value (cgi->hdf, "Config.Debugger", NULL)) == NULL)
+   {
+-    debugger = "/usr/local/bin/sudo /usr/local/bin/ddd -display %s %s %d";
++    debugger = "/usr/bin/sudo /usr/local/bin/ddd -display %s %s %d";
+   }
+ 
+   if (!pid)
+diff --git a/configure b/configure
+index 8fc6a50..e49342e 100755
+--- a/configure
++++ b/configure
+@@ -6513,7 +6513,7 @@ if test $cs_cv_python = yes; then
+ echo $ECHO_N "checking for python includes... $ECHO_C" >&6
+   python_inc=no
+   python_lib=no
+-  python_search_path="/neo/opt /usr/local /usr /c"
++  python_search_path="/usr"
+   python_versions="2.4 2.3 2.2 2.1 2.0 1.5 24 23 22 21 20 15"
+   if test $cs_cv_python_path != "no" -a -x $cs_cv_python_path; then
+     python_bin=$cs_cv_python_path
+@@ -6809,7 +6809,8 @@ echo "${ECHO_T}$_cur" >&6
+ done
+ _ACJNI_FOLLOWED="$_cur"
+ 
+-_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[^/]*$::'`
++#_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[^/]*$::'`
++_JTOPDIR="$java_path"
+ case "$host_os" in
+         darwin*)        _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[^/]*$::'`
+                         _JINC="$_JTOPDIR/Headers";;
+diff --git a/imd/imdm.py b/imd/imdm.py
+index 442c1ee..c23f590 100755
+--- a/imd/imdm.py
++++ b/imd/imdm.py
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/python
++#!/usr/bin/python
+ #
+ # imdm
+ # 
+diff --git a/java-jni/Makefile b/java-jni/Makefile
+index 390bdf5..f6edba5 100644
+--- a/java-jni/Makefile
++++ b/java-jni/Makefile
+@@ -40,14 +40,14 @@ org_clearsilver_HDF.h: $(NEO_UTIL_JAVA_JAR)
+ org_clearsilver_CS.h: $(NEO_UTIL_JAVA_JAR)
+ 	$(JAVAH) -classpath $(NEO_UTIL_JAVA_JAR) -jni org.clearsilver.CS
+ 
+-CSTest.class: CSTest.java
++CSTest.class: CSTest.java $(NEO_UTIL_JAVA_JAR)
+ 	$(JAVAC) -classpath $(NEO_UTIL_JAVA_JAR) CSTest.java
+ 
+ gold: CSTest.class
+ 	@/bin/sh -c "LD_LIBRARY_PATH=$(NEOTONIC_ROOT)/java-jni; export LD_LIBRARY_PATH; CLASSPATH=$(NEO_UTIL_JAVA_JAR):.; export CLASSPATH; $(JAVA_PATH)/bin/java CSTest" > javatest.gold
+ 	@echo "Generated gold files"
+ 
+-test: CSTest.class
++test: CSTest.class $(NEO_UTIL_SO)
+ 	@echo "Running java test"
+ 	@failed=0; \
+ 	rm -f javatest.out; \
+diff --git a/ruby/Makefile b/ruby/Makefile
+index a8a82bf..02cf557 100644
+--- a/ruby/Makefile
++++ b/ruby/Makefile
+@@ -41,7 +41,7 @@ testrb: ext/hdf/hdf.so
+ 
+ 
+ install: all
+-	$(RUBY) install.rb install
++	$(RUBY) install.rb install --prefix=$(DESTDIR)
+ 
+ clean:
+ 	$(RM) ext/hdf/*.o ext/hdf/*.so
diff --git a/clearsilver.spec b/clearsilver.spec
index 76c5375..909158f 100644
--- a/clearsilver.spec
+++ b/clearsilver.spec
@@ -1,14 +1,14 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           clearsilver
-Version:        0.10.4
-Release:        5%{?dist}
+Version:        0.10.5
+Release:        1%{?dist}
 Summary:        Fast and powerful HTML templating system
 Group:          Development/Libraries
 License:        Neotonic ClearSilver Software License
 URL:            http://www.clearsilver.net/
 Source0:        http://www.clearsilver.net/downloads/%{name}-%{version}.tar.gz
-Patch0:         %{name}-0.10.3-fedora.patch
+Patch0:         clearsilver-0.10.5-fedora.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  zlib-devel
 BuildRequires:  httpd-devel
diff --git a/sources b/sources
index dc5bc1a..fdbc9ae 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9523df7ef17e41a01dbae5032a3e450b  clearsilver-0.10.4.tar.gz
+b8c0c7fbe0ef5e06e0c935f134304d44  clearsilver-0.10.5.tar.gz