diff --git a/README.txt b/README.txt
index 1cec2d8..c8a66f3 100644
--- a/README.txt
+++ b/README.txt
@@ -89,7 +89,7 @@ cases, as described below.
 |            |   maintained       |                     |                     |
 |            | * mass download of |                     |                     |
 |            |   access strings to|                     |                     |
-|            |   csv file         |                     |                     |
+|            |   tsv file         |                     |                     |
 |____________|____________________|_____________________|_____________________|
 |            |                    | * Security: access  |                     |
 |            |                    |   strings are stored|                     |
@@ -163,7 +163,7 @@ CONFIGURATION
 
 2. Give the "login via URL" permission to users who are allowed to log in with
    this module
-3. Generate login strings (can be downloaded as a CSV file). Login strings are
+3. Generate login strings (can be downloaded as a TSV file). Login strings are
    in the form:
     o http://example.com/l/12CHARSTRING/my_blog_page where the '/l/' and the 12
       character access string have been inserted into the URL.
@@ -196,4 +196,3 @@ The urllogin module is sponsored by Corporate Finance Associates
 
 Licensed under the GPL 2.0.
 http://www.gnu.org/licenses/gpl-2.0.txt
-
diff --git a/urllogin.inc b/urllogin.inc
index c2afc43..03b3d18 100644
--- a/urllogin.inc
+++ b/urllogin.inc
@@ -59,8 +59,8 @@ function urllogin_admin_settings() {
   $form['userlist'] = array(
     '#type' => 'fieldset',
     '#title' => t('Bulk generation of access URLs'),
-    '#description' => '<p>' . t('A bulk download of all user logon strings as a tab-separated csv file can be downloaded
-      by right-clicking and saving ') . l(t('this link'), 'urllogin/userlist.csv') . '.</p><p>'
+    '#description' => '<p>' . t('A bulk download of all user logon strings as a tab-separated tsv file can be downloaded
+      by right-clicking and saving ') . l(t('this link'), 'urllogin/userlist.tsv') . '.</p><p>'
       . t('But first set the following options (if required) and <strong><em>save the form</em></strong>.') . '</p>',
     '#collapsible' => TRUE,
     '#collapsed' => FALSE,
@@ -307,8 +307,8 @@ function urllogin_link_page($urlstring = 'none') {
 }
 
 /**
- * Link to download of user access URL's as a csv.
- * A theme template file is needed of the page-urllogin-userlist.csv.tpl
+ * Link to download of user access URL's as a tsv.
+ * A theme template file is needed of the page-urllogin-userlist.tsv.tpl
  * containing the single line: < ?php print $content; ? >
  *
  * @todo test whether profile module is installed and if fields are correct
@@ -324,8 +324,8 @@ function urllogin_userlist_page() {
   $destination = '/' . variable_get('urllogin_destination', '');
 
   // Tell browser this is not a web page but a file to download.
-  drupal_add_http_header('Content-Type', 'text/csv; charset=utf-8');
-  drupal_add_http_header('Content-Disposition', 'inline; filename="userlist.csv"');
+  drupal_add_http_header('Content-Type', 'text/tab-separated-values; charset=utf-8');
+  drupal_add_http_header('Content-Disposition', 'inline; filename="userlist.tsv"');
 
   // Find out if all authenticated users have the permission and
   // use a different SQL query depending on result.
@@ -380,4 +380,3 @@ function urllogin_userlist_page() {
  */
   }
 }
-
diff --git a/urllogin.module b/urllogin.module
index 10ac7f3..6e7e278 100644
--- a/urllogin.module
+++ b/urllogin.module
@@ -125,7 +125,7 @@ function urllogin_menu() {
     'type' => MENU_CALLBACK,
     'file' => 'urllogin.inc',
   );
-  $items['urllogin/userlist.csv'] = array(
+  $items['urllogin/userlist.tsv'] = array(
     'title' => "download user access URL's",
     'description' => "download user access URL's as a file of tab separated variables",
     'page callback' => 'urllogin_userlist_page',
@@ -136,4 +136,3 @@ function urllogin_menu() {
   );
   return $items;
 }
-