diff --git a/fetch_doc.rb b/fetch_doc.rb
index 9a8aca3..f498c59 100755
--- a/fetch_doc.rb
+++ b/fetch_doc.rb
@@ -11,7 +11,7 @@ require 'open-uri'
 BASE_URI = 'http://www.pamusb.org/wiki/doc/'
 DOC_PATH = './pam_usb/doc/'
 DOCS = [ 'installation', 'upgrading', 'configuration', 'faq' ]
-MANS = [ 'pusb_hotplug', 'pusb_adm', 'pusb_check' ]
+MANS = [ 'pusb_hotplug', 'pusb_conf', 'pusb_check' ]
 
 REPLACE_LIST = [
 	# Remove wiki links [[link|name]]
diff --git a/pam_usb/Makefile b/pam_usb/Makefile
index 76f8b4b..70a6032 100644
--- a/pam_usb/Makefile
+++ b/pam_usb/Makefile
@@ -32,7 +32,7 @@ PUSB_CHECK_OBJS	:= $(PUSB_CHECK_SRCS:.c=.o)
 PUSB_CHECK	:= pusb_check
 
 # Tools
-PUSB_ADM	:= tools/pusb_adm
+PUSB_CONF	:= tools/pusb_conf
 PUSB_HOTPLUG	:= tools/pusb_hotplug
 TOOLS_DEST	:= $(DESTDIR)/usr/bin
 
@@ -45,7 +45,7 @@ DOCS		:= doc/INSTALLATION doc/CONFIGURATION doc/UPGRADING doc/FAQ
 DOCS_DEST	:= $(DESTDIR)/usr/share/doc/pamusb
 
 # Man
-MANS		:= doc/pusb_adm.1.gz doc/pusb_hotplug.1.gz doc/pusb_check.1.gz
+MANS		:= doc/pusb_conf.1.gz doc/pusb_hotplug.1.gz doc/pusb_check.1.gz
 MANS_DEST	:= $(DESTDIR)/usr/share/man/man1
 
 # Binaries
@@ -74,13 +74,13 @@ clean		:
 install		: all
 		$(MKDIR) -p $(CONFS_DEST) $(DOCS_DEST)
 		$(INSTALL) -m644 $(PAM_USB) $(PAM_USB_DEST)
-		$(INSTALL) -m755 $(PUSB_CHECK) $(PUSB_ADM) $(PUSB_HOTPLUG) $(TOOLS_DEST)
+		$(INSTALL) -m755 $(PUSB_CHECK) $(PUSB_CONF) $(PUSB_HOTPLUG) $(TOOLS_DEST)
 		$(INSTALL) -m644 $(CONFS) $(CONFS_DEST)
 		$(INSTALL) -m644 $(DOCS) $(DOCS_DEST)
 		$(INSTALL) -m644 $(MANS) $(MANS_DEST)
 
 deinstall	:
 		$(RM) -f $(PAM_USB_DEST)/$(PAM_USB)
-		$(RM) -f $(TOOLS_DEST)/$(PUSB_CHECK) $(TOOLS_DEST)/$(PUSB_ADM) $(TOOLS_DEST)/$(PUSB_HOTPLUG)
+		$(RM) -f $(TOOLS_DEST)/$(PUSB_CHECK) $(TOOLS_DEST)/$(PUSB_CONF) $(TOOLS_DEST)/$(PUSB_HOTPLUG)
 		$(RM) -rf $(DOCS_DEST)
 		$(RM) -f $(MANS_DEST)/pusb_*
diff --git a/pam_usb/doc/CONFIGURATION b/pam_usb/doc/CONFIGURATION
index 1a381a6..518430b 100644
--- a/pam_usb/doc/CONFIGURATION
+++ b/pam_usb/doc/CONFIGURATION
@@ -176,7 +176,7 @@ combine and override options.
 <!-- Device settings -->
 <devices>
   <device id="MyDevice">
-    <!-- This part was generated by pusb_adm -->
+    <!-- This part was generated by pusb_conf -->
     <vendor>SanDisk Corp.</vendor>
     <model>Cruzer Titanium</model>
     <serial>SNDKXXXXXXXXXXXXXXXX</serial>
diff --git a/pam_usb/doc/INSTALLATION b/pam_usb/doc/INSTALLATION
index 85d2307..768e92a 100644
--- a/pam_usb/doc/INSTALLATION
+++ b/pam_usb/doc/INSTALLATION
@@ -9,7 +9,7 @@ an older version of pamusb.
   * libhal-storage
   * libxml2
 
-* Requirements for pusb_hotplug and pusb_adm:
+* Requirements for pusb_hotplug and pusb_conf:
   * python2.4
   * python-celementtree
   * python-dbus
@@ -35,10 +35,10 @@ $ make
 
 cp /etc/pusb/pusb.conf-dist /etc/pusb/pusb.conf
 
-* Once you've connected your USB device to the computer, use pusb_adm to add it
+* Once you've connected your USB device to the computer, use pusb_conf to add it
 to the configuration file:
 
-# pusb_adm --add-device MyDevice
+# pusb_conf --add-device MyDevice
 Name            : MyDevice
 Vendor          : SanDisk Corp.
 Model           : Cruzer Titanium
@@ -49,7 +49,7 @@ Save device to /etc/pusb/pusb.conf ?
 Done.
 
 Note that MyDevice can be any arbitrary name you'd like.
-If more devices are connected, pusb_adm will ask you which device you want to
+If more devices are connected, pusb_conf will ask you which device you want to
 use.
 
 * Edit your /etc/pusb/pusb.conf config file to add the users:
diff --git a/pam_usb/doc/pusb.conf-dist b/pam_usb/doc/pusb.conf-dist
index e0204c6..bd422e7 100644
--- a/pam_usb/doc/pusb.conf-dist
+++ b/pam_usb/doc/pusb.conf-dist
@@ -16,7 +16,7 @@ See http://www.pamusb.org/doc/configuring
 	<!-- Device settings -->
 	<devices>
 		<!-- Example:
-		Note: You should use pusb_adm to add devices automatically.
+		Note: You should use pusb_conf to add devices automatically.
 		<device id="MyDevice">
 			<vendor>SanDisk Corp.</vendor>
 			<model>Cruzer Titanium</model>
diff --git a/pam_usb/doc/pusb_adm.1.gz b/pam_usb/doc/pusb_adm.1.gz
deleted file mode 100644
index 2d26449..0000000
Binary files a/pam_usb/doc/pusb_adm.1.gz and /dev/null differ
diff --git a/pam_usb/doc/pusb_check.1.gz b/pam_usb/doc/pusb_check.1.gz
index 7df7177..cc40156 100644
Binary files a/pam_usb/doc/pusb_check.1.gz and b/pam_usb/doc/pusb_check.1.gz differ
diff --git a/pam_usb/doc/pusb_conf.1.gz b/pam_usb/doc/pusb_conf.1.gz
new file mode 100644
index 0000000..78c7fc3
Binary files /dev/null and b/pam_usb/doc/pusb_conf.1.gz differ
diff --git a/pam_usb/doc/pusb_hotplug.1.gz b/pam_usb/doc/pusb_hotplug.1.gz
index c1e7923..1b631cd 100644
Binary files a/pam_usb/doc/pusb_hotplug.1.gz and b/pam_usb/doc/pusb_hotplug.1.gz differ