diff --git a/src/conf.c b/src/conf.c
index 72fcf7b..bdfef8e 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2006 Andrea Luzzardi <scox@sig11.org>
+ * Copyright (c) 2003-2007 Andrea Luzzardi <scox@sig11.org>
  *
  * This file is part of the pam_usb project. pam_usb is free software;
  * you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/src/conf.h b/src/conf.h
index 31c2093..0a0ea8f 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2006 Andrea Luzzardi <scox@sig11.org>
+ * Copyright (c) 2003-2007 Andrea Luzzardi <scox@sig11.org>
  *
  * This file is part of the pam_usb project. pam_usb is free software;
  * you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/src/conf.xml b/src/conf.xml
deleted file mode 100644
index fa982d3..0000000
--- a/src/conf.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<configuration>
-	<defaults>
-		<option name="hostname">foobar</option>
-		<option name="one_time_pad">true</option>
-		<option name="probe_timeout">10</option>
-		<option name="debug">false</option>
-		<!--		<option name="system_pad_directory">.</option>
-		<option name="device_pad_directory">.auth</option> -->
-	</defaults>
-
-	<devices>
-		<device id="foobar">
-			<vendor>SanDisk Corp.</vendor>
-			<model>Cruzer Titanium</model>
-			<serial>SNDKB882652FC4A03701</serial>
-			<volume_uuid>3B69-1AFD</volume_uuid>
-		</device>
-	</devices>
-
-
-	<users>
-		<user id="scox">
-			<device>foobar</device>
-			<option name="one_time_pad">false</option>
-		</user>
-
-		<user id="root">
-			<device>foobar</device>
-		</user>
-	</users>
-
-	<services>
-		<!-- Disable pam_usb for sshd (nonsense) -->
-		<service id="ssh">
-			<option name="enable">false</option>
-		</service>
-
-		<!-- Speed up 'login' authentication by disabling one time pads.
-		     This setting will not affect user 'root' as he/she is
-		     enforcing one time pads (enforce_otp).
-		-->
-		<service id="login">
-			<option name="one_time_pad">false</option>
-		</service>
-	</services>
-</configuration>
diff --git a/src/device.c b/src/device.c
index 79a68ca..24667a4 100644
--- a/src/device.c
+++ b/src/device.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2006 Andrea Luzzardi <scox@sig11.org>
+ * Copyright (c) 2003-2007 Andrea Luzzardi <scox@sig11.org>
  *
  * This file is part of the pam_usb project. pam_usb is free software;
  * you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/src/device.h b/src/device.h
index 1418ba3..253b270 100644
--- a/src/device.h
+++ b/src/device.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2006 Andrea Luzzardi <scox@sig11.org>
+ * Copyright (c) 2003-2007 Andrea Luzzardi <scox@sig11.org>
  *
  * This file is part of the pam_usb project. pam_usb is free software;
  * you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/src/hal.c b/src/hal.c
index 1aa18b5..49e1d84 100644
--- a/src/hal.c
+++ b/src/hal.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2006 Andrea Luzzardi <scox@sig11.org>
+ * Copyright (c) 2003-2007 Andrea Luzzardi <scox@sig11.org>
  *
  * This file is part of the pam_usb project. pam_usb is free software;
  * you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/src/hal.h b/src/hal.h
index 274bdd7..b4e8ea8 100644
--- a/src/hal.h
+++ b/src/hal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2006 Andrea Luzzardi <scox@sig11.org>
+ * Copyright (c) 2003-2007 Andrea Luzzardi <scox@sig11.org>
  *
  * This file is part of the pam_usb project. pam_usb is free software;
  * you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/src/local.c b/src/local.c
index 39edc3d..7372b0a 100644
--- a/src/local.c
+++ b/src/local.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2006 Andrea Luzzardi <scox@sig11.org>
+ * Copyright (c) 2003-2007 Andrea Luzzardi <scox@sig11.org>
  *
  * This file is part of the pam_usb project. pam_usb is free software;
  * you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/src/local.h b/src/local.h
index ed796ea..88e4ce7 100644
--- a/src/local.h
+++ b/src/local.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2006 Andrea Luzzardi <scox@sig11.org>
+ * Copyright (c) 2003-2007 Andrea Luzzardi <scox@sig11.org>
  *
  * This file is part of the pam_usb project. pam_usb is free software;
  * you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/src/log.c b/src/log.c
index c004fb7..303f40d 100644
--- a/src/log.c
+++ b/src/log.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2006 Andrea Luzzardi <scox@sig11.org>
+ * Copyright (c) 2003-2007 Andrea Luzzardi <scox@sig11.org>
  *
  * This file is part of the pam_usb project. pam_usb is free software;
  * you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/src/log.h b/src/log.h
index 52f8999..ca439f7 100644
--- a/src/log.h
+++ b/src/log.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2006 Andrea Luzzardi <scox@sig11.org>
+ * Copyright (c) 2003-2007 Andrea Luzzardi <scox@sig11.org>
  *
  * This file is part of the pam_usb project. pam_usb is free software;
  * you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/src/pad.c b/src/pad.c
index 83891f1..177838c 100644
--- a/src/pad.c
+++ b/src/pad.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2006 Andrea Luzzardi <scox@sig11.org>
+ * Copyright (c) 2003-2007 Andrea Luzzardi <scox@sig11.org>
  *
  * This file is part of the pam_usb project. pam_usb is free software;
  * you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/src/pad.h b/src/pad.h
index b528df9..18bbf9d 100644
--- a/src/pad.h
+++ b/src/pad.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2006 Andrea Luzzardi <scox@sig11.org>
+ * Copyright (c) 2003-2007 Andrea Luzzardi <scox@sig11.org>
  *
  * This file is part of the pam_usb project. pam_usb is free software;
  * you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/src/pam.c b/src/pam.c
index 322c0aa..943ba40 100644
--- a/src/pam.c
+++ b/src/pam.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2006 Andrea Luzzardi <scox@sig11.org>
+ * Copyright (c) 2003-2007 Andrea Luzzardi <scox@sig11.org>
  *
  * This file is part of the pam_usb project. pam_usb is free software;
  * you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/src/pusb_check.c b/src/pusb_check.c
index 1a3258b..2cae547 100644
--- a/src/pusb_check.c
+++ b/src/pusb_check.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2006 Andrea Luzzardi <scox@sig11.org>
+ * Copyright (c) 2003-2007 Andrea Luzzardi <scox@sig11.org>
  *
  * This file is part of the pam_usb project. pam_usb is free software;
  * you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/src/version.h b/src/version.h
index 7e79597..99b4a90 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2006 Andrea Luzzardi <scox@sig11.org>
+ * Copyright (c) 2003-2007 Andrea Luzzardi <scox@sig11.org>
  *
  * This file is part of the pam_usb project. pam_usb is free software;
  * you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/src/volume.c b/src/volume.c
index 202e443..5c3dd01 100644
--- a/src/volume.c
+++ b/src/volume.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2006 Andrea Luzzardi <scox@sig11.org>
+ * Copyright (c) 2003-2007 Andrea Luzzardi <scox@sig11.org>
  *
  * This file is part of the pam_usb project. pam_usb is free software;
  * you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/src/volume.h b/src/volume.h
index b9dadf0..53d604b 100644
--- a/src/volume.h
+++ b/src/volume.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2006 Andrea Luzzardi <scox@sig11.org>
+ * Copyright (c) 2003-2007 Andrea Luzzardi <scox@sig11.org>
  *
  * This file is part of the pam_usb project. pam_usb is free software;
  * you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/src/xpath.c b/src/xpath.c
index 40ec8a6..f47b0c2 100644
--- a/src/xpath.c
+++ b/src/xpath.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2006 Andrea Luzzardi <scox@sig11.org>
+ * Copyright (c) 2003-2007 Andrea Luzzardi <scox@sig11.org>
  *
  * This file is part of the pam_usb project. pam_usb is free software;
  * you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/src/xpath.h b/src/xpath.h
index 578ffcd..76ec59d 100644
--- a/src/xpath.h
+++ b/src/xpath.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2006 Andrea Luzzardi <scox@sig11.org>
+ * Copyright (c) 2003-2007 Andrea Luzzardi <scox@sig11.org>
  *
  * This file is part of the pam_usb project. pam_usb is free software;
  * you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/tools/pusb_conf b/tools/pusb_conf
index da3889a..62259d1 100755
--- a/tools/pusb_conf
+++ b/tools/pusb_conf
@@ -1,6 +1,6 @@
 #!/usr/bin/env python2.4
 #
-# Copyright (c) 2003-2006 Andrea Luzzardi <scox@sig11.org>
+# Copyright (c) 2003-2007 Andrea Luzzardi <scox@sig11.org>
 #
 # This file is part of the pam_usb project. pam_usb is free software;
 # you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/tools/pusb_hotplug b/tools/pusb_hotplug
index b1c7ebc..42ddf22 100755
--- a/tools/pusb_hotplug
+++ b/tools/pusb_hotplug
@@ -1,6 +1,6 @@
 #!/usr/bin/env python2.4
 #
-# Copyright (c) 2003-2006 Andrea Luzzardi <scox@sig11.org>
+# Copyright (c) 2003-2007 Andrea Luzzardi <scox@sig11.org>
 #
 # This file is part of the pam_usb project. pam_usb is free software;
 # you can redistribute it and/or modify it under the terms of the GNU General