diff --git a/pam_usb/Makefile b/pam_usb/Makefile
index 753b982..40bd2b6 100644
--- a/pam_usb/Makefile
+++ b/pam_usb/Makefile
@@ -46,7 +46,7 @@ DOCS		:= doc/INSTALLATION doc/CONFIGURATION doc/UPGRADING doc/FAQ
 DOCS_DEST	:= $(DESTDIR)/usr/share/doc/pamusb
 
 # Man
-MANS		:= doc/pusb_conf.1.gz doc/pusb_hotplug.1.gz doc/pusb_check.1.gz
+MANS		:= doc/pamusb-conf.1.gz doc/pamusb-agent.1.gz doc/pamusb-check.1.gz
 MANS_DEST	:= $(DESTDIR)/usr/share/man/man1
 
 # Binaries
diff --git a/pam_usb/utils/fetch_doc.rb b/pam_usb/utils/fetch_doc.rb
index 8037113..df2f519 100755
--- a/pam_usb/utils/fetch_doc.rb
+++ b/pam_usb/utils/fetch_doc.rb
@@ -11,7 +11,7 @@ require 'open-uri'
 BASE_URI = 'http://www.pamusb.org/wiki/doc/'
 DOC_PATH = '../doc/'
 DOCS = [ 'installation', 'upgrading', 'configuration', 'faq' ]
-MANS = [ 'pusb_hotplug', 'pusb_conf', 'pusb_check' ]
+MANS = [ 'pamusb-check', 'pamusb-agent', 'pamusb-conf' ]
 
 REPLACE_LIST = [
 	# Remove wiki links [[link|name]]