diff --git a/build.xml b/build.xml
index 2ae3d6ca..7cbef596 100644
--- a/build.xml
+++ b/build.xml
@@ -49,7 +49,7 @@
   <target name="compile" depends="prepare,compute-builds">
     <javac srcdir="${src.dir}" destdir="${deploy.dir}/classes"
            debug="on" optimize="${build.optimize}" deprecation="off"
-           source="1.5" target="1.5">
+           source="1.5" target="1.5" encoding="utf-8">
       <classpath refid="classpath"/>
       <exclude name="com/samskivert/io/**" unless="build.io"/>
       <exclude name="com/samskivert/jdbc/**" unless="build.jdbc"/>
diff --git a/src/java/com/samskivert/jdbc/depot/DepotMarshaller.java b/src/java/com/samskivert/jdbc/depot/DepotMarshaller.java
index 3f11e4da..0b371b88 100644
--- a/src/java/com/samskivert/jdbc/depot/DepotMarshaller.java
+++ b/src/java/com/samskivert/jdbc/depot/DepotMarshaller.java
@@ -2,7 +2,7 @@
 // $Id$
 //
 // samskivert library - useful routines for java programs
-// Copyright (C) 2006 Michael Bayne, P&auml;r Winzell
+// Copyright (C) 2006 Michael Bayne, Pär Winzell
 //
 // This library is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License as published
diff --git a/src/java/com/samskivert/jdbc/depot/DepotRepository.java b/src/java/com/samskivert/jdbc/depot/DepotRepository.java
index 4c521240..8e958e65 100644
--- a/src/java/com/samskivert/jdbc/depot/DepotRepository.java
+++ b/src/java/com/samskivert/jdbc/depot/DepotRepository.java
@@ -2,7 +2,7 @@
 // $Id$
 //
 // samskivert library - useful routines for java programs
-// Copyright (C) 2006 Michael Bayne, P&auml;r Winzell
+// Copyright (C) 2006 Michael Bayne, Pär Winzell
 // 
 // This library is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License as published
diff --git a/src/java/com/samskivert/jdbc/depot/FieldMarshaller.java b/src/java/com/samskivert/jdbc/depot/FieldMarshaller.java
index 329361d6..08100567 100644
--- a/src/java/com/samskivert/jdbc/depot/FieldMarshaller.java
+++ b/src/java/com/samskivert/jdbc/depot/FieldMarshaller.java
@@ -2,7 +2,7 @@
 // $Id$
 //
 // samskivert library - useful routines for java programs
-// Copyright (C) 2006 Michael Bayne, P&auml;r Winzell
+// Copyright (C) 2006 Michael Bayne, Pär Winzell
 // 
 // This library is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License as published
diff --git a/src/java/com/samskivert/jdbc/depot/IdentityKeyGenerator.java b/src/java/com/samskivert/jdbc/depot/IdentityKeyGenerator.java
index 27c16879..4eab5e56 100644
--- a/src/java/com/samskivert/jdbc/depot/IdentityKeyGenerator.java
+++ b/src/java/com/samskivert/jdbc/depot/IdentityKeyGenerator.java
@@ -2,7 +2,7 @@
 // $Id$
 //
 // samskivert library - useful routines for java programs
-// Copyright (C) 2006 Michael Bayne, P&auml;r Winzell
+// Copyright (C) 2006 Michael Bayne, Pär Winzell
 // 
 // This library is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License as published
diff --git a/src/java/com/samskivert/jdbc/depot/KeyGenerator.java b/src/java/com/samskivert/jdbc/depot/KeyGenerator.java
index 3bd400f9..9ce40a2b 100644
--- a/src/java/com/samskivert/jdbc/depot/KeyGenerator.java
+++ b/src/java/com/samskivert/jdbc/depot/KeyGenerator.java
@@ -2,7 +2,7 @@
 // $Id$
 //
 // samskivert library - useful routines for java programs
-// Copyright (C) 2006 Michael Bayne, P&auml;r Winzell
+// Copyright (C) 2006 Michael Bayne, Pär Winzell
 // 
 // This library is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License as published
diff --git a/src/java/com/samskivert/jdbc/depot/Log.java b/src/java/com/samskivert/jdbc/depot/Log.java
index ae41769f..21861672 100644
--- a/src/java/com/samskivert/jdbc/depot/Log.java
+++ b/src/java/com/samskivert/jdbc/depot/Log.java
@@ -2,7 +2,7 @@
 // $Id$
 //
 // samskivert library - useful routines for java programs
-// Copyright (C) 2006 Michael Bayne, P&auml;r Winzell
+// Copyright (C) 2006 Michael Bayne, Pär Winzell
 // 
 // This library is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License as published
diff --git a/src/java/com/samskivert/jdbc/depot/PersistenceContext.java b/src/java/com/samskivert/jdbc/depot/PersistenceContext.java
index d992155e..d2d41dd7 100644
--- a/src/java/com/samskivert/jdbc/depot/PersistenceContext.java
+++ b/src/java/com/samskivert/jdbc/depot/PersistenceContext.java
@@ -2,7 +2,7 @@
 // $Id$
 //
 // samskivert library - useful routines for java programs
-// Copyright (C) 2006 Michael Bayne, P&auml;r Winzell
+// Copyright (C) 2006 Michael Bayne, Pär Winzell
 // 
 // This library is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License as published
diff --git a/src/java/com/samskivert/jdbc/depot/TableKeyGenerator.java b/src/java/com/samskivert/jdbc/depot/TableKeyGenerator.java
index e7e7af83..0a3e59a9 100644
--- a/src/java/com/samskivert/jdbc/depot/TableKeyGenerator.java
+++ b/src/java/com/samskivert/jdbc/depot/TableKeyGenerator.java
@@ -2,7 +2,7 @@
 // $Id$
 //
 // samskivert library - useful routines for java programs
-// Copyright (C) 2006 Michael Bayne, P&auml;r Winzell
+// Copyright (C) 2006 Michael Bayne, Pär Winzell
 // 
 // This library is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License as published