Index: m4/docbook.m4
===================================================================
--- m4/docbook.m4	(revision 14574)
+++ m4/docbook.m4	(working copy)
@@ -3,7 +3,7 @@
 dnl
 dnl Modified slightly by Brian Tarricone, January 2005.
 
-AC_DEFUN(BT_CHECK_DOCBOOK, [
+AC_DEFUN([BT_CHECK_DOCBOOK], [
 
 # don't use networked versions if possible
 XSLTPROC_FLAGS=--nonet
Index: src/mainwin-callbacks.c
===================================================================
--- src/mainwin-callbacks.c	(revision 14574)
+++ src/mainwin-callbacks.c	(working copy)
@@ -21,7 +21,9 @@
 #include <config.h>
 #endif
 
-#ifdef HAVE_STRING_H
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#elif HAVE_STRING_H
 #include <string.h>
 #endif
 
Index: xfmedia.desktop.in
===================================================================
--- xfmedia.desktop.in	(revision 14574)
+++ xfmedia.desktop.in	(working copy)
@@ -1,10 +1,13 @@
 [Desktop Entry]
+Version=1.0
+Type=Application
 Encoding=UTF-8
 _Name=Xfmedia
 _Comment=Lightweight Media Player
+TryExec=xfmedia
 Exec=xfmedia
 Icon=xfmedia
 Terminal=false
-Type=Application
-Categories=X-XFCE;Application;AudioVideo;AudioPlayer;VideoPlayer
+Categories=X-XFCE;Application;AudioVideo;AudioPlayer;VideoPlayer;
+OnlyShowIn=XFCE;
 StartupNotify=true