diff --git a/Makefile.am b/Makefile.am
index 85077c668..da62573bc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -264,7 +264,7 @@ src_mpd_SOURCES = \
 	src/server_socket.c \
 	src/listen.c \
 	src/log.c \
-	src/ls.c \
+	src/ls.cxx \
 	src/io_error.h \
 	src/io_thread.c src/io_thread.h \
 	src/Main.cxx src/Main.hxx \
diff --git a/src/ls.c b/src/ls.cxx
similarity index 96%
rename from src/ls.c
rename to src/ls.cxx
index 90e5fc66e..00edb2bb5 100644
--- a/src/ls.c
+++ b/src/ls.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2011 The Music Player Daemon Project
+ * Copyright (C) 2003-2013 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,12 @@
  */
 
 #include "config.h"
+
+extern "C" {
 #include "ls.h"
 #include "uri.h"
 #include "client.h"
+}
 
 #include <glib.h>