diff --git a/Makefile b/Makefile
index b8defec..d19be8e 100644
--- a/Makefile
+++ b/Makefile
@@ -76,7 +76,7 @@ install		: all
 		$(MKDIR) -p $(CONFS_DEST) $(DOCS_DEST) $(MANS_DEST) $(TOOLS_DEST) $(PAM_USB_DEST)
 		$(INSTALL) -m755 $(PAM_USB) $(PAM_USB_DEST)
 		$(INSTALL) -m755 $(PAMUSB_CHECK) $(TOOLS_SRC)/$(PAMUSB_CONF) $(TOOLS_SRC)/$(PAMUSB_AGENT) $(TOOLS_DEST)
-		$(INSTALL) -m644 $(CONFS) $(CONFS_DEST)
+		$(INSTALL) -b -m644 $(CONFS) $(CONFS_DEST)
 		$(INSTALL) -m644 $(DOCS) $(DOCS_DEST)
 		$(INSTALL) -m644 $(MANS) $(MANS_DEST)
 
diff --git a/doc/pamusb.conf b/doc/pamusb.conf
index b153461..1a3f900 100644
--- a/doc/pamusb.conf
+++ b/doc/pamusb.conf
@@ -1,6 +1,5 @@
 <!--
-pusb.conf-dist: Default configuration file for pam_usb.
-Copy this file to /etc/pusb/pusb.conf if you don't already have one.
+pamusb.conf: Configuration file for pam_usb.
 
 See http://www.pamusb.org/doc/configuring
 -->
@@ -16,7 +15,7 @@ See http://www.pamusb.org/doc/configuring
 	<!-- Device settings -->
 	<devices>
 		<!-- Example:
-		Note: You should use pusb_conf to add devices automatically.
+		Note: You should use pamusb-conf to add devices automatically.
 		<device id="MyDevice">
 			<vendor>SanDisk Corp.</vendor>
 			<model>Cruzer Titanium</model>
@@ -31,11 +30,11 @@ See http://www.pamusb.org/doc/configuring
 	<!-- User settings -->
 	<users>
 		<!-- Example:
-			<user id="root">
+			<user id="scox">
 				<device>MyDevice</device>
 				<option name="quiet">true</option>
-				<hotplug event="lock">gnome-screensaver-command -lock</hotplug>
-				<hotplug event="unlock">gnome-screensaver-command -deactivate</hotplug>
+				<agent event="lock">gnome-screensaver-command -lock</agent>
+				<agent event="unlock">gnome-screensaver-command -deactivate</agent>
 			</user>
 		-->
 	</users>
diff --git a/tools/pamusb-agent b/tools/pamusb-agent
index c4c3588..eb686c7 100755
--- a/tools/pamusb-agent
+++ b/tools/pamusb-agent
@@ -155,7 +155,7 @@ events = {
     'unlock' : []
     }
 
-for hotplug in user.findall('hotplug'):
+for hotplug in user.findall('agent'):
     events[hotplug.get('event')].append(hotplug.text)
 
 deviceName = user.find('device').text