diff --git a/pam_usb/Makefile b/pam_usb/Makefile
index 4ea8008..b8defec 100644
--- a/pam_usb/Makefile
+++ b/pam_usb/Makefile
@@ -22,7 +22,7 @@ OBJS		:= $(SRCS:.c=.o)
 # pam_usb
 PAM_USB_SRCS	:= src/pam.c
 PAM_USB_OBJS	:= $(PAM_USB_SRCS:.c=.o)
-PAM_USB		:= pam_usb.so
+PAM_USB			:= pam_usb.so
 PAM_USB_LDFLAGS	:= -shared
 PAM_USB_DEST	:= $(DESTDIR)/lib/security
 
@@ -38,8 +38,8 @@ TOOLS_DEST		:= $(DESTDIR)/usr/bin
 TOOLS_SRC		:= tools
 
 # Conf
-CONFS			:= doc/pusb.conf-dist
-CONFS_DEST		:= $(DESTDIR)/etc/pusb
+CONFS			:= doc/pamusb.conf
+CONFS_DEST		:= $(DESTDIR)/etc
 
 # Doc
 DOCS		:= doc/INSTALLATION doc/CONFIGURATION doc/UPGRADING doc/FAQ
@@ -73,7 +73,7 @@ clean		:
 		$(RM) -f $(PAM_USB) $(PAMUSB_CHECK) $(OBJS) $(PAMUSB_CHECK_OBJS) $(PAM_USB_OBJS)
 
 install		: all
-		$(MKDIR) -p $(CONFS_DEST) $(DOCS_DEST)
+		$(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)
diff --git a/pam_usb/doc/pusb.conf-dist b/pam_usb/doc/pamusb.conf
similarity index 100%
rename from pam_usb/doc/pusb.conf-dist
rename to pam_usb/doc/pamusb.conf
diff --git a/pam_usb/src/conf.h b/pam_usb/src/conf.h
index d020005..3382488 100644
--- a/pam_usb/src/conf.h
+++ b/pam_usb/src/conf.h
@@ -17,7 +17,7 @@
 
 #ifndef PUSB_CONF_H_
 # define PUSB_CONF_H_
-# define PUSB_CONF_FILE "/etc/pusb/pusb.conf"
+# define PUSB_CONF_FILE "/etc/pamusb.conf"
 # define CONF_DEVICE_XPATH "//configuration/devices/device[@id='%s']/%s"
 # define CONF_USER_XPATH "//configuration/users/user[@id='%s']/%s"
 # define CONF_SERVICE_XPATH "//configuration/services/service[@id='%s']/%s"
diff --git a/pam_usb/tools/pamusb-agent b/pam_usb/tools/pamusb-agent
index cc9863d..c4c3588 100755
--- a/pam_usb/tools/pamusb-agent
+++ b/pam_usb/tools/pamusb-agent
@@ -114,7 +114,7 @@ try:
 except getopt.GetoptError:
     usage()
 
-options = {'configFile' : '/etc/pusb/pusb.conf',
+options = {'configFile' : '/etc/pamusb.conf',
             'daemon' : False,
             'path' : '/usr/bin/pamusb-check'}
 
diff --git a/pam_usb/tools/pamusb-conf b/pam_usb/tools/pamusb-conf
index abc545e..47954b9 100755
--- a/pam_usb/tools/pamusb-conf
+++ b/pam_usb/tools/pamusb-conf
@@ -172,7 +172,7 @@ if len(args) != 0:
     usage()
 
 options = { 'force' : False, 'deviceName' : None,
-            'configFile' : '/etc/pusb/pusb.conf' }
+            'configFile' : '/etc/pamusb.conf' }
 
 for o, a in opts:
     if o in ("-h", "--help"):