diff --git a/Persephone.xcodeproj/project.pbxproj b/Persephone.xcodeproj/project.pbxproj
index 4382fe5..f6cccb0 100644
--- a/Persephone.xcodeproj/project.pbxproj
+++ b/Persephone.xcodeproj/project.pbxproj
@@ -1013,45 +1013,45 @@
 		E48056CB2426D73300362CF3 /* mpd */ = {
 			isa = PBXGroup;
 			children = (
-				E48056CC2426D73400362CF3 /* connection.h */,
-				E48056CD2426D73400362CF3 /* protocol.h */,
-				E48056CE2426D73400362CF3 /* error.h */,
-				E48056CF2426D73400362CF3 /* recv.h */,
-				E48056D02426D73400362CF3 /* neighbor.h */,
-				E48056D12426D73400362CF3 /* client.h */,
-				E48056D22426D73400362CF3 /* song.h */,
-				E48056D32426D73400362CF3 /* response.h */,
-				E48056D42426D73400362CF3 /* status.h */,
-				E48056D52426D73400362CF3 /* tag.h */,
-				E48056D62426D73400362CF3 /* compiler.h */,
-				E48056D72426D73400362CF3 /* settings.h */,
-				E48056D82426D73400362CF3 /* version.h.in */,
-				E48056D92426D73400362CF3 /* parser.h */,
-				E48056DA2426D73400362CF3 /* idle.h */,
-				E48056DB2426D73400362CF3 /* message.h */,
-				E48056DC2426D73400362CF3 /* player.h */,
-				E48056DD2426D73400362CF3 /* output.h */,
-				E48056DE2426D73400362CF3 /* mixer.h */,
-				E48056DF2426D73400362CF3 /* list.h */,
 				E48056E02426D73400362CF3 /* async.h */,
-				E48056E12426D73400362CF3 /* directory.h */,
-				E48056E22426D73400362CF3 /* replay_gain.h */,
-				E48056E32426D73400362CF3 /* database.h */,
-				E48056E42426D73400362CF3 /* partition.h */,
-				E48056E52426D73400362CF3 /* entity.h */,
-				E48056E62426D73400362CF3 /* pair.h */,
-				E48056E72426D73400362CF3 /* send.h */,
-				E48056E82426D73400362CF3 /* password.h */,
 				E48056E92426D73400362CF3 /* audio_format.h */,
-				E48056EA2426D73400362CF3 /* mount.h */,
-				E48056EB2426D73400362CF3 /* sticker.h */,
-				E48056EC2426D73400362CF3 /* search.h */,
-				E48056ED2426D73400362CF3 /* fingerprint.h */,
-				E48056EE2426D73400362CF3 /* socket.h */,
-				E48056EF2426D73400362CF3 /* stats.h */,
 				E48056F02426D73400362CF3 /* capabilities.h */,
-				E48056F12426D73400362CF3 /* queue.h */,
+				E48056D12426D73400362CF3 /* client.h */,
+				E48056D62426D73400362CF3 /* compiler.h */,
+				E48056CC2426D73400362CF3 /* connection.h */,
+				E48056E32426D73400362CF3 /* database.h */,
+				E48056E12426D73400362CF3 /* directory.h */,
+				E48056E52426D73400362CF3 /* entity.h */,
+				E48056CE2426D73400362CF3 /* error.h */,
+				E48056ED2426D73400362CF3 /* fingerprint.h */,
+				E48056DA2426D73400362CF3 /* idle.h */,
+				E48056DF2426D73400362CF3 /* list.h */,
+				E48056DB2426D73400362CF3 /* message.h */,
+				E48056DE2426D73400362CF3 /* mixer.h */,
+				E48056EA2426D73400362CF3 /* mount.h */,
+				E48056D02426D73400362CF3 /* neighbor.h */,
+				E48056DD2426D73400362CF3 /* output.h */,
+				E48056E62426D73400362CF3 /* pair.h */,
+				E48056D92426D73400362CF3 /* parser.h */,
+				E48056E42426D73400362CF3 /* partition.h */,
+				E48056E82426D73400362CF3 /* password.h */,
+				E48056DC2426D73400362CF3 /* player.h */,
 				E48056F22426D73400362CF3 /* playlist.h */,
+				E48056CD2426D73400362CF3 /* protocol.h */,
+				E48056F12426D73400362CF3 /* queue.h */,
+				E48056CF2426D73400362CF3 /* recv.h */,
+				E48056E22426D73400362CF3 /* replay_gain.h */,
+				E48056D32426D73400362CF3 /* response.h */,
+				E48056EC2426D73400362CF3 /* search.h */,
+				E48056E72426D73400362CF3 /* send.h */,
+				E48056D72426D73400362CF3 /* settings.h */,
+				E48056EE2426D73400362CF3 /* socket.h */,
+				E48056D22426D73400362CF3 /* song.h */,
+				E48056EF2426D73400362CF3 /* stats.h */,
+				E48056D42426D73400362CF3 /* status.h */,
+				E48056EB2426D73400362CF3 /* sticker.h */,
+				E48056D52426D73400362CF3 /* tag.h */,
+				E48056D82426D73400362CF3 /* version.h.in */,
 			);
 			path = mpd;
 			sourceTree = "<group>";
diff --git a/bin/setup b/bin/setup
index 2d8031a..d92a2fc 100755
--- a/bin/setup
+++ b/bin/setup
@@ -2,3 +2,10 @@
 
 git submodule update --init
 git apply --directory=libmpdclient/ libmpdclient.patch
+
+pushd libmpdclient
+
+meson . output
+ninja -C output
+
+popd