diff -rupN gtktalog-1.0.4.orig/configure.in gtktalog-1.0.4.new/configure.in
--- gtktalog-1.0.4.orig/configure.in	2003-09-01 16:54:47.000000000 -0500
+++ gtktalog-1.0.4.new/configure.in	2011-03-15 16:18:57.000000000 -0500
@@ -17,12 +17,14 @@ AM_PROG_LEX
 AC_PROG_YACC
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
+AM_PROG_MKDIR_P
 #AM_PROG_LIBTOOL
 
 dnl Internationalization
 dnl ====================
 ALL_LINGUAS="fr pl hu ja es sv ca cs nl de sk it ru pt_BR"
 AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION(0.18.1)
 
 localedir=${datadir}/locale
 AC_SUBST(localedir)
@@ -50,7 +52,7 @@ dnl ========================
 AC_HEADER_DIRENT
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(fcntl.h strings.h sys/ioctl.h unistd.h)
+AC_CHECK_HEADERS(fcntl.h strings.h sys/ioctl.h unistd.h sys/mtio.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 dnl ==============================================================
diff -rupN gtktalog-1.0.4.orig/po/Makefile.in.in gtktalog-1.0.4.new/po/Makefile.in.in
--- gtktalog-1.0.4.orig/po/Makefile.in.in	2003-05-08 04:23:12.000000000 -0500
+++ gtktalog-1.0.4.new/po/Makefile.in.in	2011-03-15 15:28:25.000000000 -0500
@@ -21,6 +21,7 @@ VPATH = @srcdir@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 datadir = @datadir@
+datarootdir = @datarootdir@
 localedir = $(datadir)/locale
 gettextsrcdir = $(datadir)/gettext/po
 
diff -rupN gtktalog-1.0.4.orig/src/gtktalog/eject.c gtktalog-1.0.4.new/src/gtktalog/eject.c
--- gtktalog-1.0.4.orig/src/gtktalog/eject.c	2000-07-21 15:38:42.000000000 -0500
+++ gtktalog-1.0.4.new/src/gtktalog/eject.c	2011-03-13 21:01:44.000000000 -0500
@@ -20,7 +20,9 @@
 #include <gnome.h>
 #include <stdio.h>
 #include <sys/ioctl.h>
+#if defined(HAVE_SYS_MTIO_H)
 #include <sys/mtio.h>
+#endif
 #include <sys/types.h>
 #include <linux/cdrom.h>
 #include <fcntl.h>
diff -rupN gtktalog-1.0.4.orig/src/gtktalog/fastaddisk.c gtktalog-1.0.4.new/src/gtktalog/fastaddisk.c
--- gtktalog-1.0.4.orig/src/gtktalog/fastaddisk.c	2002-05-18 11:03:21.000000000 -0500
+++ gtktalog-1.0.4.new/src/gtktalog/fastaddisk.c	2011-03-13 21:02:45.000000000 -0500
@@ -30,14 +30,15 @@
 #include <signal.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
+#if defined(HAVE_SYS_MTIO_H)
 #include <sys/mtio.h>
+#endif
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>
 #if defined(USE_PTHREADS)
 #    include <pthread.h>
 #endif
-#include <sys/mtio.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <unistd.h>
diff -rupN gtktalog-1.0.4.orig/src/gtktalog/progressbar.c gtktalog-1.0.4.new/src/gtktalog/progressbar.c
--- gtktalog-1.0.4.orig/src/gtktalog/progressbar.c	2002-04-30 07:51:38.000000000 -0500
+++ gtktalog-1.0.4.new/src/gtktalog/progressbar.c	2011-03-14 16:28:13.000000000 -0500
@@ -90,6 +90,7 @@ progress_needReset ()
 glong
 getStats (char *foldername)
 {
+#if HAVE_STATFS
   struct statfs statBuf;
 
   if (statfs (foldername, &statBuf) == -1)
@@ -98,6 +99,9 @@ getStats (char *foldername)
 
   /* Total size of the CD in Bytes */
   return statBuf.f_blocks * statBuf.f_bsize;
+#else
+  return -1;
+#endif
 }
 
 void
diff -rupN gtktalog-1.0.4.orig/src/gtktalog/report.c gtktalog-1.0.4.new/src/gtktalog/report.c
--- gtktalog-1.0.4.orig/src/gtktalog/report.c	2003-06-20 14:23:58.000000000 -0500
+++ gtktalog-1.0.4.new/src/gtktalog/report.c	2011-03-16 12:28:43.000000000 -0500
@@ -333,7 +333,7 @@ print_file (FILE_DATA * fd, FILE * file)
   if (gb_html_report)
     fprintf (file, "<TR>");
   if (gb_xml_report)
-    fprintf (file, xml_directory_st);
+    fprintf (file, "%s", xml_directory_st);
   if (gb_check_disks)
     {
       if (gb_xml_report)
@@ -521,7 +521,7 @@ print_file (FILE_DATA * fd, FILE * file)
   if (gb_html_report)
     fprintf (file, "</TR>");
   if (gb_xml_report)
-    fprintf (file, xml_directory_ed);
+    fprintf (file, "%s", xml_directory_ed);
   fprintf (file, "\n");
 }
 
diff -rupN gtktalog-1.0.4.orig/src/plugins/aviinfo.cpp gtktalog-1.0.4.new/src/plugins/aviinfo.cpp
--- gtktalog-1.0.4.orig/src/plugins/aviinfo.cpp	2001-01-06 07:34:03.000000000 -0600
+++ gtktalog-1.0.4.new/src/plugins/aviinfo.cpp	2011-03-16 12:25:10.000000000 -0500
@@ -63,11 +63,11 @@ struct avi
 	struct avi_audio audio;
 };
 
-char* version="0.1";
-char* author="Panagiotis Issaris";
-char* email="panagiotis.issaris@advalvas.be";
-char* pluginname="aviinfo";
-char* date="2000";
+const char* version="0.1";
+const char* author="Panagiotis Issaris";
+const char* email="panagiotis.issaris@advalvas.be";
+const char* pluginname="aviinfo";
+const char* date="2000";
 
 void strtolower(char* str)
 {
diff -rupN gtktalog-1.0.4.orig/src/plugins/html.cpp gtktalog-1.0.4.new/src/plugins/html.cpp
--- gtktalog-1.0.4.orig/src/plugins/html.cpp	2002-04-13 15:45:30.000000000 -0500
+++ gtktalog-1.0.4.new/src/plugins/html.cpp	2011-03-16 12:24:06.000000000 -0500
@@ -19,14 +19,13 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <iostream.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 
 
-char* RESPONSE_END="|END|";
+const char* RESPONSE_END="|END|";
 
 void strtolower(char* str)
 {
diff -rupN gtktalog-1.0.4.orig/src/plugins/mp3.cpp gtktalog-1.0.4.new/src/plugins/mp3.cpp
--- gtktalog-1.0.4.orig/src/plugins/mp3.cpp	2000-08-20 09:22:51.000000000 -0500
+++ gtktalog-1.0.4.new/src/plugins/mp3.cpp	2011-03-16 12:20:54.000000000 -0500
@@ -1,4 +1,3 @@
-#include <iostream.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include "mp3tag.h"