diff --git a/src/Makefile b/src/Makefile
index cbf87b1b..0102d6f0 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,4 +1,4 @@
-# @(#$Id: Makefile,v 1.16 2005-11-21 16:04:49 dockes Exp $  (C) 2005 J.F.Dockes
+# @(#$Id: Makefile,v 1.17 2005-11-23 10:19:09 dockes Exp $  (C) 2005 J.F.Dockes
 
 # Default values. These can be overridden on the command line ie: 
 # make PREFIX=/usr
@@ -25,7 +25,7 @@ static:
 	cd lib; ${MAKE}
 	cd bincimapmime; ${MAKE}
 	cd index; rm -f recollindex; \
-	   ${MAKE} BSTATIC=-Wl,-Bstatic BDYNAMIC=-Wl,-Bdynamic
+	   ${MAKE} BSTATIC=-Wl,-Bstatic BDYNAMIC=-Wl,-Bdynamic recollindex
 	cd qtgui; qmake recoll.pro; rm -f recoll; \
 	   cat ../mk/sysconf ../mk/localdefs Makefile | ${MAKE} -f - \
 	       BSTATIC=-Wl,-Bstatic BDYNAMIC=-Wl,-Bdynamic
diff --git a/src/VERSION b/src/VERSION
index b0f3d96f..66c4c226 100644
--- a/src/VERSION
+++ b/src/VERSION
@@ -1 +1 @@
-1.0.8
+1.0.9
diff --git a/src/filters/rclrtf b/src/filters/rclrtf
index 90f89e75..553fc647 100755
--- a/src/filters/rclrtf
+++ b/src/filters/rclrtf
@@ -1,5 +1,5 @@
 #!/bin/sh
-# @(#$Id: rclrtf,v 1.1 2005-11-21 16:05:07 dockes Exp $  (C) 2004 J.F.Dockes
+# @(#$Id: rclrtf,v 1.2 2005-11-23 10:17:53 dockes Exp $  (C) 2004 J.F.Dockes
 # Some inspiration from estraier
 #================================================================
 # rclrtf
@@ -64,7 +64,7 @@ BEGIN {
 }
 /<\/head>/{
     if (gothead == 0) {
-        printf("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=ISO8859-1\">\n")
+        printf("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=iso-8859-1\">\n")
 	gothead = 1
     }
 }
diff --git a/src/index/Makefile b/src/index/Makefile
index a92197be..5a646b18 100644
--- a/src/index/Makefile
+++ b/src/index/Makefile
@@ -21,7 +21,7 @@ trcsguess.o : csguess.cpp
 MIMETYPE_OBJS= trmimetype.o  $(BIGLIB) 
 mimetype : $(MIMETYPE_OBJS)
 	$(CXX) $(CXXFLAGS) -o mimetype $(MIMETYPE_OBJS) \
-	       $(LIBICONV)
+	       $(LIBICONV) $(LIBSYS)
 trmimetype.o : mimetype.cpp
 	$(CXX) $(CXXFLAGS) -DTEST_MIMETYPE -c -o trmimetype.o \
 	       mimetype.cpp
diff --git a/src/index/mimetype.cpp b/src/index/mimetype.cpp
index db49930f..ac35b0a7 100644
--- a/src/index/mimetype.cpp
+++ b/src/index/mimetype.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: mimetype.cpp,v 1.12 2005-11-21 17:18:58 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: mimetype.cpp,v 1.13 2005-11-23 10:19:00 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 
 #ifndef TEST_MIMETYPE
@@ -125,7 +125,7 @@ string mimetype(const string &fn, RclConfig *cfg, bool usfc)
 
 
 #else // TEST->
-
+#include <stdio.h>
 #include <iostream>
 
 #include "debuglog.h"
diff --git a/src/utils/debuglog.cpp b/src/utils/debuglog.cpp
index 0a71b1f6..008581ac 100755
--- a/src/utils/debuglog.cpp
+++ b/src/utils/debuglog.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid [] = "@(#$Id: debuglog.cpp,v 1.1 2005-11-12 14:24:33 dockes Exp $  (C) 2002 OKYZ";
+static char rcsid [] = "@(#$Id: debuglog.cpp,v 1.2 2005-11-23 10:15:18 dockes Exp $  (C) 2002 OKYZ";
 #endif
 #ifndef TEST_DEBUGLOG
 
@@ -173,7 +173,11 @@ DebugLog::prolog(int lev, const char *f, int line)
     char buf[100];
     sprintf(buf, ":%d:", lev);
     writer->put(buf);
-#if DEBUGLOG_USE_THREADS
+#if DEBUGLOG_SHOW_PID
+    sprintf(buf, "%d:", getpid());
+    writer->put(buf);
+#endif
+#if DEBUGLOG_SHOW_THREAD
     sprintf(buf, "%lx:", (unsigned long)pthread_self());
     writer->put(buf);
 #endif
diff --git a/src/utils/mimeparse.cpp b/src/utils/mimeparse.cpp
index 9c8d9347..801bc063 100644
--- a/src/utils/mimeparse.cpp
+++ b/src/utils/mimeparse.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: mimeparse.cpp,v 1.6 2005-11-06 11:16:53 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: mimeparse.cpp,v 1.7 2005-11-23 10:17:15 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 
 #ifndef TEST_MIMEPARSE
@@ -318,7 +318,7 @@ bool rfc2047_decode(const std::string& in, std::string &out)
 			// we sometimes find 8-bit chars in
 			// there. Interpret as Iso8859.
 			if (value.length() > 0) {
-			    transcode(value, utf8, "ISO8859-1", "UTF-8");
+			    transcode(value, utf8, "ISO-8859-1", "UTF-8");
 			    out += utf8;
 			    value = "";
 			}
@@ -378,7 +378,7 @@ bool rfc2047_decode(const std::string& in, std::string &out)
     }
 
     if (value.length() > 0) {
-	transcode(value, utf8, "ISO8859-1", "UTF-8");
+	transcode(value, utf8, "ISO-8859-1", "UTF-8");
 	out += utf8;
 	value = "";
     }