diff --git a/Makefile b/Makefile
index 767d914..156d0df 100644
--- a/Makefile
+++ b/Makefile
@@ -46,10 +46,10 @@ all:
 
 # Installation rules.
 
-etcprefix = /etc/ykksm
+etcprefix = /etc/yubico/ksm
 binprefix = /usr/bin
-phpprefix = /usr/share/ykksm
-docprefix = /usr/share/doc/ykksm
+phpprefix = /usr/share/yubikey-ksm
+docprefix = /usr/share/doc/yubikey-ksm
 wwwgroup = www-data
 
 install: $(MANS)
diff --git a/NEWS b/NEWS
index c7e5127..9496642 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,9 @@
 * Version 1.10 (unreleased)
 
+  * Changed location of files to /usr/share/yubikey-ksm, etc.
+
+  * Changed location of configuration files to /etc/yubico/ksm/.
+
 * Version 1.9 (released 2013-01-23)
 
   * Renamed hex2bin to yubi_hex2bin.
@@ -18,7 +22,7 @@
     Issue #5 reported by Gyula Szabó, see:
     http://code.google.com/p/yubikey-ksm/issues/detail?id=5>.
 
-  * Read database config from /etc/ykksm/config-db files,
+  * Read database config from /etc/yubico/ksm/config-db files,
     as generated by dbconfig.
 
 * Version 1.6 (released 2012-12-18)
diff --git a/doc b/doc
index bfda50b..b102d2b 160000
--- a/doc
+++ b/doc
@@ -1 +1 @@
-Subproject commit bfda50b698334a92d5f0824e5cf94394ce6c5707
+Subproject commit b102d2b5d107d9f6ee3bdc126e5ec0db689dbbb6
diff --git a/ykksm-checksum b/ykksm-checksum
index e5c714a..a3bc064 100755
--- a/ykksm-checksum
+++ b/ykksm-checksum
@@ -57,8 +57,8 @@ sub usage {
 
 #Support dbconfig-common generated database settings, if available
 our ($dbuser, $dbpass, $basepath, $dbname, $dbserver, $dbport, $dbtype);
-if( -e '/etc/ykksm/config-db.cfg' ) {
-    require '/etc/ykksm/config-db.cfg';
+if( -e '/etc/yubico/ksm/config-db.cfg' ) {
+    require '/etc/yubico/ksm/config-db.cfg';
 } else {
     $dbtype = 'mysql';
     $dbname = 'ykksm';
diff --git a/ykksm-config.php b/ykksm-config.php
index 50ccb8d..57b162c 100644
--- a/ykksm-config.php
+++ b/ykksm-config.php
@@ -1,7 +1,7 @@
 <?php
-//ykksm will use the configuration stored in /etc/ykksm/config-db.php, if that file exists. If it does not exist, the below values will be used.
+//ykksm will use the configuration stored in /etc/yubico/ksm/config-db.php, if that file exists. If it does not exist, the below values will be used.
 
-if(!include '/etc/ykksm/config-db.php') {
+if(!include '/etc/yubico/ksm/config-db.php') {
 	$dbuser='ykksmreader';
 	$dbpass='yourpassword';
 	$basepath='';
diff --git a/ykksm-export b/ykksm-export
index 4fb886d..e8712c4 100755
--- a/ykksm-export
+++ b/ykksm-export
@@ -55,8 +55,8 @@ sub usage {
 
 #Support dbconfig-common generated database settings, if available
 our ($dbuser, $dbpass, $basepath, $dbname, $dbserver, $dbport, $dbtype);
-if( -e '/etc/ykksm/config-db.cfg' ) {
-    require '/etc/ykksm/config-db.cfg';
+if( -e '/etc/yubico/ksm/config-db.cfg' ) {
+    require '/etc/yubico/ksm/config-db.cfg';
 } else {
     $dbtype = 'mysql';
     $dbname = 'ykksm';
diff --git a/ykksm-import b/ykksm-import
index f27d4a4..b86b13b 100755
--- a/ykksm-import
+++ b/ykksm-import
@@ -59,8 +59,8 @@ sub usage {
 
 #Support dbconfig-common generated database settings, if available
 our ($dbuser, $dbpass, $basepath, $dbname, $dbserver, $dbport, $dbtype);
-if( -e '/etc/ykksm/config-db.cfg' ) {
-    require '/etc/ykksm/config-db.cfg';
+if( -e '/etc/yubico/ksm/config-db.cfg' ) {
+    require '/etc/yubico/ksm/config-db.cfg';
 } else {
     $dbtype = 'mysql';
     $dbname = 'ykksm';