diff -Naur tvtime-1.0.8-orig/README tvtime-1.0.8/README

--- tvtime-1.0.8-orig/README	2014-06-30 11:21:58.000000000 +0000

+++ tvtime-1.0.8/README	2015-10-30 09:00:04.843948531 +0000

@@ -114,7 +114,7 @@

 4.1 stationlist.xml

     ---------------

-The station listing is read in from the ~/.tvtime/stationlist.xml.

+The station listing is read in from the ~/.config/tvtime/stationlist.xml.

 Channel settings are saved specific to norm and frequency table.

 For more information on the specific format used, see

 'man stationlist.xml'.

diff -Naur tvtime-1.0.8-orig/docs/man/de/stationlist.xml.5 tvtime-1.0.8/docs/man/de/stationlist.xml.5

--- tvtime-1.0.8-orig/docs/man/de/stationlist.xml.5	2014-06-30 11:21:58.000000000 +0000

+++ tvtime-1.0.8/docs/man/de/stationlist.xml.5	2015-10-30 09:00:04.843948531 +0000

@@ -23,7 +23,7 @@

 .SH ÜBERSICHT

-.I ~/.tvtime/stationlist.xml

+.I ~/.config/tvtime/stationlist.xml

 .SH BESCHREIBUNG

diff -Naur tvtime-1.0.8-orig/docs/man/de/tvtime.1 tvtime-1.0.8/docs/man/de/tvtime.1

--- tvtime-1.0.8-orig/docs/man/de/tvtime.1	2014-06-30 11:21:58.000000000 +0000

+++ tvtime-1.0.8/docs/man/de/tvtime.1	2015-10-30 09:00:04.842948535 +0000

@@ -350,9 +350,9 @@

 .I /tvtime/tvtime.xml

 .br

-.I $HOME/.tvtime/tvtime.xml

+.I $HOME/.config/tvtime/tvtime.xml

 .br

-.I $HOME/.tvtime/stationlist.xml

+.I $HOME/.config/tvtime/stationlist.xml

 .br

 .I /var/run/tvtime/TV-*/tvtimefifo

diff -Naur tvtime-1.0.8-orig/docs/man/de/tvtime.xml.5 tvtime-1.0.8/docs/man/de/tvtime.xml.5

--- tvtime-1.0.8-orig/docs/man/de/tvtime.xml.5	2014-06-30 11:21:58.000000000 +0000

+++ tvtime-1.0.8/docs/man/de/tvtime.xml.5	2015-10-30 09:00:04.842948535 +0000

@@ -23,7 +23,7 @@

 .SH ÜBERSICHT

-.I ~/.tvtime/tvtime.xml

+.I ~/.config/tvtime/tvtime.xml

 .br

 .I /etc/tvtime/tvtime.xml

 .br

diff -Naur tvtime-1.0.8-orig/docs/man/en/stationlist.xml.5 tvtime-1.0.8/docs/man/en/stationlist.xml.5

--- tvtime-1.0.8-orig/docs/man/en/stationlist.xml.5	2014-06-30 11:21:58.000000000 +0000

+++ tvtime-1.0.8/docs/man/en/stationlist.xml.5	2015-10-30 09:00:04.841948540 +0000

@@ -22,7 +22,7 @@

 .SH SYNOPSIS

-.I ~/.tvtime/stationlist.xml

+.I ~/.config/tvtime/stationlist.xml

 .SH DESCRIPTION

diff -Naur tvtime-1.0.8-orig/docs/man/en/tvtime.1 tvtime-1.0.8/docs/man/en/tvtime.1

--- tvtime-1.0.8-orig/docs/man/en/tvtime.1	2014-06-30 11:21:58.000000000 +0000

+++ tvtime-1.0.8/docs/man/en/tvtime.1	2015-10-30 09:00:04.840948544 +0000

@@ -347,9 +347,9 @@

 .I /tvtime/tvtime.xml

 .br

-.I $HOME/.tvtime/tvtime.xml

+.I $HOME/.config/tvtime/tvtime.xml

 .br

-.I $HOME/.tvtime/stationlist.xml

+.I $HOME/.config/tvtime/stationlist.xml

 .br

 .I /var/run/tvtime/TV-*/tvtimefifo

diff -Naur tvtime-1.0.8-orig/docs/man/en/tvtime.xml.5 tvtime-1.0.8/docs/man/en/tvtime.xml.5

--- tvtime-1.0.8-orig/docs/man/en/tvtime.xml.5	2014-06-30 11:21:58.000000000 +0000

+++ tvtime-1.0.8/docs/man/en/tvtime.xml.5	2015-10-30 09:00:04.841948540 +0000

@@ -22,7 +22,7 @@

 .SH SYNOPSIS

-.I ~/.tvtime/tvtime.xml

+.I ~/.config/tvtime/tvtime.xml

 .br

 .I /etc/tvtime/tvtime.xml

 .br

diff -Naur tvtime-1.0.8-orig/docs/man/es/stationlist.xml.5 tvtime-1.0.8/docs/man/es/stationlist.xml.5

--- tvtime-1.0.8-orig/docs/man/es/stationlist.xml.5	2014-06-30 11:21:58.000000000 +0000

+++ tvtime-1.0.8/docs/man/es/stationlist.xml.5	2015-10-30 09:00:04.840948544 +0000

@@ -27,7 +27,7 @@

 .SH SINOPSIS

-.I ~/.tvtime/stationlist.xml

+.I ~/.config/tvtime/stationlist.xml

 .SH DESCRIPCIÓN

diff -Naur tvtime-1.0.8-orig/docs/man/es/tvtime.1 tvtime-1.0.8/docs/man/es/tvtime.1

--- tvtime-1.0.8-orig/docs/man/es/tvtime.1	2014-06-30 11:21:58.000000000 +0000

+++ tvtime-1.0.8/docs/man/es/tvtime.1	2015-10-30 09:00:04.839948549 +0000

@@ -356,9 +356,9 @@

 .I /tvtime/tvtime.xml

 .br

-.I $HOME/.tvtime/tvtime.xml

+.I $HOME/.config/tvtime/tvtime.xml

 .br

-.I $HOME/.tvtime/stationlist.xml

+.I $HOME/.config/tvtime/stationlist.xml

 .br

 .I /var/run/tvtime/TV-*/tvtimefifo

diff -Naur tvtime-1.0.8-orig/docs/man/es/tvtime.xml.5 tvtime-1.0.8/docs/man/es/tvtime.xml.5

--- tvtime-1.0.8-orig/docs/man/es/tvtime.xml.5	2014-06-30 11:21:58.000000000 +0000

+++ tvtime-1.0.8/docs/man/es/tvtime.xml.5	2015-10-30 09:00:04.840948544 +0000

@@ -27,7 +27,7 @@

 .SH SINOPSIS

-.I ~/.tvtime/tvtime.xml

+.I ~/.config/tvtime/tvtime.xml

 .br

 .I /etc/tvtime/tvtime.xml

 .br

diff -Naur tvtime-1.0.8-orig/src/station.c tvtime-1.0.8/src/station.c

--- tvtime-1.0.8-orig/src/station.c	2015-01-27 01:38:06.000000000 +0000

+++ tvtime-1.0.8/src/station.c	2015-10-30 09:00:04.833948575 +0000

@@ -369,7 +369,7 @@

         return 0;

     }

     strncpy( mgr->stationrc, home_dir, 235 );

-    strncat( mgr->stationrc, "/.tvtime/stationlist.xml", 255 );

+    strncat( mgr->stationrc, "/.config/tvtime/stationlist.xml", 255 );

     mgr->verbose = verbose;

     mgr->first = 0;

     mgr->current = 0;

@@ -1079,7 +1079,7 @@

     if( !rp ) return 0;

     strncpy( filename, getenv( "HOME" ), 235 );

-    strncat( filename, "/.tvtime/stationlist.xml", 255 );

+    strncat( filename, "/.config/tvtime/stationlist.xml", 255 );

     doc = xmlParseFile( filename );

     if( !doc ) {

diff -Naur tvtime-1.0.8-orig/src/tvtimeconf.c tvtime-1.0.8/src/tvtimeconf.c

--- tvtime-1.0.8-orig/src/tvtimeconf.c	2015-01-27 01:38:06.000000000 +0000

+++ tvtime-1.0.8/src/tvtimeconf.c	2015-10-30 09:00:04.837948558 +0000

@@ -882,8 +882,8 @@

     ct->buttonmapmenu[ 4 ] = TVTIME_MENU_UP;

     ct->buttonmapmenu[ 5 ] = TVTIME_MENU_DOWN;

-    /* Make the ~/.tvtime directory every time on startup, to be safe. */

-    if( asprintf( &temp_dirname, "%s/.tvtime", getenv( "HOME" ) ) < 0 ) {

+    /* Make the ~/.config/tvtime directory every time on startup, to be safe. */

+    if( asprintf( &temp_dirname, "%s/.config/tvtime", getenv( "HOME" ) ) < 0 ) {

         /* FIXME: Clean up ?? */

         return 0;

     }

@@ -899,7 +899,7 @@

     free( base );

     /* Then read in local settings. */

-    asprintf( &base, "%s/.tvtime/tvtime.xml", getenv( "HOME" ) );

+    asprintf( &base, "%s/.config/tvtime/tvtime.xml", getenv( "HOME" ) );

     ct->config_filename = strdup( base );

     if( file_is_openable_for_read( base ) ) {

         lfprintf( stderr, _("Reading configuration from %s\n"), base );

diff -Naur tvtime-1.0.8-orig/src/tvtimeconf.h tvtime-1.0.8/src/tvtimeconf.h

--- tvtime-1.0.8-orig/src/tvtimeconf.h	2014-06-30 11:21:58.000000000 +0000

+++ tvtime-1.0.8/src/tvtimeconf.h	2015-10-30 09:00:04.839948549 +0000

@@ -47,7 +47,7 @@

  * Create a new config object.  This will initialize the internal data

  * structures and attempt to read the default config file from the

  * config file in $sysconfdir/tvtime/tvtime.xml and then override these

- * with the values in $HOME/.tvtime/tvtime.xml.

+ * with the values in $HOME/.config/tvtime/tvtime.xml.

  */

 config_t *config_new( void );

diff -Naur tvtime-1.0.8-orig/src/utils.c tvtime-1.0.8/src/utils.c

--- tvtime-1.0.8-orig/src/utils.c	2014-06-30 11:21:58.000000000 +0000

+++ tvtime-1.0.8/src/utils.c	2015-10-30 09:00:04.838948553 +0000

@@ -204,7 +204,7 @@

     /* If we can't use our /tmp directory, put the fifo in $HOME. */

     if( !mkdir_and_force_owner( fifodir, uid, getgid() ) ) {

-        if( asprintf( &fifo, "%s/.tvtime/tvtimefifo-%s",

+        if( asprintf( &fifo, "%s/.config/tvtime/tvtimefifo-%s",

                       getenv( "HOME" ), hostname ) < 0 ) {

             fifo = 0;

         }