diff --git a/.gitignore b/.gitignore
index 6c0a8c9..c763390 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,14 +8,12 @@
 *.lo
 *.la
 autom4te.cache/*
-*.in
 */.deps/*
 m4/*
 swig/*
 *.swp
 *.patch
 aclocal.m4
-config.h
 config.log
 config.sub
 config.guess
@@ -37,3 +35,4 @@ docs/html
 libusbmuxd.pc
 tools/.libs/*
 tools/iproxy
+.DS_Store
diff --git a/Xcode/config.h b/Xcode/config.h
new file mode 100644
index 0000000..ea8ddb4
--- /dev/null
+++ b/Xcode/config.h
@@ -0,0 +1,64 @@
+/* config.h.  Manual generated for Xcode.  */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define if compiled with -fvisibility=hidden */
+#define HAVE_FVISIBILITY 1
+
+/* Define if you have inotify support (linux only) */
+/* #undef HAVE_INOTIFY */
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
+   to 0 otherwise. */
+#define HAVE_MALLOC 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if your system has a GNU libc compatible `realloc' function,
+   and to 0 otherwise. */
+#define HAVE_REALLOC 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the `strcasecmp' function. */
+#define HAVE_STRCASECMP 1
+
+/* Define to 1 if you have the `strdup' function. */
+#define HAVE_STRDUP 1
+
+/* Define to 1 if you have the `strerror' function. */
+#define HAVE_STRERROR 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the `strndup' function. */
+#define HAVE_STRNDUP 1
+
+/* Define to 1 if you have the <sys/inotify.h> header file. */
+/* #undef HAVE_SYS_INOTIFY_H */
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
diff --git a/Xcode/libusbmuxd.xcodeproj/project.pbxproj b/Xcode/libusbmuxd.xcodeproj/project.pbxproj
new file mode 100644
index 0000000..1866c0c
--- /dev/null
+++ b/Xcode/libusbmuxd.xcodeproj/project.pbxproj
@@ -0,0 +1,344 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		C847BE891A751F8B00271179 /* collection.c in Sources */ = {isa = PBXBuildFile; fileRef = C847BE811A751F8B00271179 /* collection.c */; };
+		C847BE8A1A751F8B00271179 /* collection.h in Headers */ = {isa = PBXBuildFile; fileRef = C847BE821A751F8B00271179 /* collection.h */; };
+		C847BE8B1A751F8B00271179 /* socket.c in Sources */ = {isa = PBXBuildFile; fileRef = C847BE841A751F8B00271179 /* socket.c */; };
+		C847BE8C1A751F8B00271179 /* socket.h in Headers */ = {isa = PBXBuildFile; fileRef = C847BE851A751F8B00271179 /* socket.h */; };
+		C847BE8D1A751F8B00271179 /* libusbmuxd.c in Sources */ = {isa = PBXBuildFile; fileRef = C847BE871A751F8B00271179 /* libusbmuxd.c */; };
+		C847BE8F1A751F9300271179 /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = C847BE8E1A751F9300271179 /* config.h */; };
+		C8EDA29F1A77D953009842F7 /* libplist.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C847BE951A751FA300271179 /* libplist.a */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXContainerItemProxy section */
+		C847BE941A751FA300271179 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = C847BE901A751FA300271179 /* libplist.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = C847BE141A7516B600271179;
+			remoteInfo = libplist;
+		};
+/* End PBXContainerItemProxy section */
+
+/* Begin PBXFileReference section */
+		C847BE791A751F2A00271179 /* libusbmuxd.a */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libusbmuxd.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		C847BE811A751F8B00271179 /* collection.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = collection.c; sourceTree = "<group>"; };
+		C847BE821A751F8B00271179 /* collection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = collection.h; sourceTree = "<group>"; };
+		C847BE831A751F8B00271179 /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.am; sourceTree = "<group>"; };
+		C847BE841A751F8B00271179 /* socket.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = socket.c; sourceTree = "<group>"; };
+		C847BE851A751F8B00271179 /* socket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = socket.h; sourceTree = "<group>"; };
+		C847BE871A751F8B00271179 /* libusbmuxd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = libusbmuxd.c; sourceTree = "<group>"; };
+		C847BE881A751F8B00271179 /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.am; sourceTree = "<group>"; };
+		C847BE8E1A751F9300271179 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
+		C847BE901A751FA300271179 /* libplist.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libplist.xcodeproj; path = ../../libplist/Xcode/libplist.xcodeproj; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		C847BE761A751F2A00271179 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				C8EDA29F1A77D953009842F7 /* libplist.a in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		C847BE701A751F2A00271179 = {
+			isa = PBXGroup;
+			children = (
+				C847BE8E1A751F9300271179 /* config.h */,
+				C847BE901A751FA300271179 /* libplist.xcodeproj */,
+				C847BE801A751F8B00271179 /* common */,
+				C847BE7A1A751F2A00271179 /* Products */,
+				C847BE861A751F8B00271179 /* src */,
+				C8A97D6E1E0FAABE0013886F /* Frameworks */,
+			);
+			sourceTree = "<group>";
+		};
+		C847BE7A1A751F2A00271179 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				C847BE791A751F2A00271179 /* libusbmuxd.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		C847BE801A751F8B00271179 /* common */ = {
+			isa = PBXGroup;
+			children = (
+				C847BE811A751F8B00271179 /* collection.c */,
+				C847BE821A751F8B00271179 /* collection.h */,
+				C847BE831A751F8B00271179 /* Makefile.am */,
+				C847BE841A751F8B00271179 /* socket.c */,
+				C847BE851A751F8B00271179 /* socket.h */,
+			);
+			name = common;
+			path = ../common;
+			sourceTree = "<group>";
+		};
+		C847BE861A751F8B00271179 /* src */ = {
+			isa = PBXGroup;
+			children = (
+				C847BE871A751F8B00271179 /* libusbmuxd.c */,
+				C847BE881A751F8B00271179 /* Makefile.am */,
+			);
+			name = src;
+			path = ../src;
+			sourceTree = "<group>";
+		};
+		C847BE911A751FA300271179 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				C847BE951A751FA300271179 /* libplist.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		C8A97D6E1E0FAABE0013886F /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXHeadersBuildPhase section */
+		C847BE771A751F2A00271179 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				C847BE8A1A751F8B00271179 /* collection.h in Headers */,
+				C847BE8C1A751F8B00271179 /* socket.h in Headers */,
+				C847BE8F1A751F9300271179 /* config.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXHeadersBuildPhase section */
+
+/* Begin PBXNativeTarget section */
+		C847BE781A751F2A00271179 /* libusbmuxd */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = C847BE7D1A751F2A00271179 /* Build configuration list for PBXNativeTarget "libusbmuxd" */;
+			buildPhases = (
+				C847BE751A751F2A00271179 /* Sources */,
+				C847BE761A751F2A00271179 /* Frameworks */,
+				C847BE771A751F2A00271179 /* Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = libusbmuxd;
+			productName = libusbmuxd;
+			productReference = C847BE791A751F2A00271179 /* libusbmuxd.a */;
+			productType = "com.apple.product-type.library.dynamic";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		C847BE711A751F2A00271179 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0610;
+				ORGANIZATIONNAME = libimobiledevice;
+				TargetAttributes = {
+					C847BE781A751F2A00271179 = {
+						CreatedOnToolsVersion = 6.1.1;
+					};
+				};
+			};
+			buildConfigurationList = C847BE741A751F2A00271179 /* Build configuration list for PBXProject "libusbmuxd" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = C847BE701A751F2A00271179;
+			productRefGroup = C847BE7A1A751F2A00271179 /* Products */;
+			projectDirPath = "";
+			projectReferences = (
+				{
+					ProductGroup = C847BE911A751FA300271179 /* Products */;
+					ProjectRef = C847BE901A751FA300271179 /* libplist.xcodeproj */;
+				},
+			);
+			projectRoot = "";
+			targets = (
+				C847BE781A751F2A00271179 /* libusbmuxd */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXReferenceProxy section */
+		C847BE951A751FA300271179 /* libplist.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = "compiled.mach-o.dylib";
+			path = libplist.a;
+			remoteRef = C847BE941A751FA300271179 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+/* End PBXReferenceProxy section */
+
+/* Begin PBXSourcesBuildPhase section */
+		C847BE751A751F2A00271179 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				C847BE8B1A751F8B00271179 /* socket.c in Sources */,
+				C847BE8D1A751F8B00271179 /* libusbmuxd.c in Sources */,
+				C847BE891A751F8B00271179 /* collection.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		C847BE7B1A751F2A00271179 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				INSTALL_PATH = "";
+				MACOSX_DEPLOYMENT_TARGET = 10.9;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = macosx;
+			};
+			name = Debug;
+		};
+		C847BE7C1A751F2A00271179 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				INSTALL_PATH = "";
+				MACOSX_DEPLOYMENT_TARGET = 10.9;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				SDKROOT = macosx;
+			};
+			name = Release;
+		};
+		C847BE7E1A751F2A00271179 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				EXECUTABLE_EXTENSION = a;
+				EXECUTABLE_PREFIX = "";
+				HEADER_SEARCH_PATHS = (
+					../../libplist/include/,
+					../include/,
+				);
+				INSTALL_PATH = "@executable_path";
+				MACH_O_TYPE = staticlib;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+			};
+			name = Debug;
+		};
+		C847BE7F1A751F2A00271179 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				EXECUTABLE_EXTENSION = a;
+				EXECUTABLE_PREFIX = "";
+				HEADER_SEARCH_PATHS = (
+					../../libplist/include/,
+					../include/,
+				);
+				INSTALL_PATH = "@executable_path";
+				MACH_O_TYPE = staticlib;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		C847BE741A751F2A00271179 /* Build configuration list for PBXProject "libusbmuxd" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				C847BE7B1A751F2A00271179 /* Debug */,
+				C847BE7C1A751F2A00271179 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		C847BE7D1A751F2A00271179 /* Build configuration list for PBXNativeTarget "libusbmuxd" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				C847BE7E1A751F2A00271179 /* Debug */,
+				C847BE7F1A751F2A00271179 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = C847BE711A751F2A00271179 /* Project object */;
+}
diff --git a/Xcode/libusbmuxd.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Xcode/libusbmuxd.xcodeproj/project.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 0000000..64f4177
--- /dev/null
+++ b/Xcode/libusbmuxd.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:libusbmuxd.xcodeproj">
+   </FileRef>
+</Workspace>
diff --git a/Xcode/libusbmuxd.xcodeproj/project.xcworkspace/xcshareddata/libusbmuxd.xccheckout b/Xcode/libusbmuxd.xcodeproj/project.xcworkspace/xcshareddata/libusbmuxd.xccheckout
new file mode 100644
index 0000000..dfb0fb5
--- /dev/null
+++ b/Xcode/libusbmuxd.xcodeproj/project.xcworkspace/xcshareddata/libusbmuxd.xccheckout
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDESourceControlProjectFavoriteDictionaryKey</key>
+	<false/>
+	<key>IDESourceControlProjectIdentifier</key>
+	<string>1E2E28E7-1C75-4EE9-A8E6-E59F4FA8874E</string>
+	<key>IDESourceControlProjectName</key>
+	<string>libusbmuxd</string>
+	<key>IDESourceControlProjectOriginsDictionary</key>
+	<dict>
+		<key>97DEBE5E75882055095471C30476BE04A8F57925</key>
+		<string>https://github.com/lunzii/libusbmuxd.git</string>
+		<key>F12AAB142D225A23A20B5B62D5F1B3376BB3038D</key>
+		<string>https://github.com/lunzii/libplist.git</string>
+	</dict>
+	<key>IDESourceControlProjectPath</key>
+	<string>Xcode/libusbmuxd.xcodeproj</string>
+	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
+	<dict>
+		<key>97DEBE5E75882055095471C30476BE04A8F57925</key>
+		<string>../../..</string>
+		<key>F12AAB142D225A23A20B5B62D5F1B3376BB3038D</key>
+		<string>../../../../libplist</string>
+	</dict>
+	<key>IDESourceControlProjectURL</key>
+	<string>https://github.com/lunzii/libusbmuxd.git</string>
+	<key>IDESourceControlProjectVersion</key>
+	<integer>111</integer>
+	<key>IDESourceControlProjectWCCIdentifier</key>
+	<string>97DEBE5E75882055095471C30476BE04A8F57925</string>
+	<key>IDESourceControlProjectWCConfigurations</key>
+	<array>
+		<dict>
+			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+			<string>public.vcs.git</string>
+			<key>IDESourceControlWCCIdentifierKey</key>
+			<string>F12AAB142D225A23A20B5B62D5F1B3376BB3038D</string>
+			<key>IDESourceControlWCCName</key>
+			<string>libplist</string>
+		</dict>
+		<dict>
+			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+			<string>public.vcs.git</string>
+			<key>IDESourceControlWCCIdentifierKey</key>
+			<string>97DEBE5E75882055095471C30476BE04A8F57925</string>
+			<key>IDESourceControlWCCName</key>
+			<string>libusbmuxd</string>
+		</dict>
+	</array>
+</dict>
+</plist>
diff --git a/Xcode/libusbmuxd.xcodeproj/project.xcworkspace/xcshareddata/libusbmuxd.xcscmblueprint b/Xcode/libusbmuxd.xcodeproj/project.xcworkspace/xcshareddata/libusbmuxd.xcscmblueprint
new file mode 100644
index 0000000..294f600
--- /dev/null
+++ b/Xcode/libusbmuxd.xcodeproj/project.xcworkspace/xcshareddata/libusbmuxd.xcscmblueprint
@@ -0,0 +1,30 @@
+{
+  "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "97DEBE5E75882055095471C30476BE04A8F57925",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
+
+  },
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
+    "F12AAB142D225A23A20B5B62D5F1B3376BB3038D" : 0,
+    "97DEBE5E75882055095471C30476BE04A8F57925" : 0
+  },
+  "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "1E2E28E7-1C75-4EE9-A8E6-E59F4FA8874E",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
+    "F12AAB142D225A23A20B5B62D5F1B3376BB3038D" : "libplist\/",
+    "97DEBE5E75882055095471C30476BE04A8F57925" : "libusbmuxd\/"
+  },
+  "DVTSourceControlWorkspaceBlueprintNameKey" : "libusbmuxd",
+  "DVTSourceControlWorkspaceBlueprintVersion" : 204,
+  "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "Xcode\/libusbmuxd.xcodeproj",
+  "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/lunzii\/libusbmuxd.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "97DEBE5E75882055095471C30476BE04A8F57925"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/lunzii\/libplist.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "F12AAB142D225A23A20B5B62D5F1B3376BB3038D"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Xcode/libusbmuxd.xcodeproj/project.xcworkspace/xcuserdata/olunx.xcuserdatad/UserInterfaceState.xcuserstate b/Xcode/libusbmuxd.xcodeproj/project.xcworkspace/xcuserdata/olunx.xcuserdatad/UserInterfaceState.xcuserstate
new file mode 100644
index 0000000..e6108cd
Binary files /dev/null and b/Xcode/libusbmuxd.xcodeproj/project.xcworkspace/xcuserdata/olunx.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/Xcode/libusbmuxd.xcodeproj/xcuserdata/olunx.xcuserdatad/xcschemes/libusbmuxd.xcscheme b/Xcode/libusbmuxd.xcodeproj/xcuserdata/olunx.xcuserdatad/xcschemes/libusbmuxd.xcscheme
new file mode 100644
index 0000000..68ff712
--- /dev/null
+++ b/Xcode/libusbmuxd.xcodeproj/xcuserdata/olunx.xcuserdatad/xcschemes/libusbmuxd.xcscheme
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0820"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "C847BE781A751F2A00271179"
+               BuildableName = "libusbmuxd.a"
+               BlueprintName = "libusbmuxd"
+               ReferencedContainer = "container:libusbmuxd.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "C847BE781A751F2A00271179"
+            BuildableName = "libusbmuxd.a"
+            BlueprintName = "libusbmuxd"
+            ReferencedContainer = "container:libusbmuxd.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "C847BE781A751F2A00271179"
+            BuildableName = "libusbmuxd.a"
+            BlueprintName = "libusbmuxd"
+            ReferencedContainer = "container:libusbmuxd.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Xcode/libusbmuxd.xcodeproj/xcuserdata/olunx.xcuserdatad/xcschemes/xcschememanagement.plist b/Xcode/libusbmuxd.xcodeproj/xcuserdata/olunx.xcuserdatad/xcschemes/xcschememanagement.plist
new file mode 100644
index 0000000..13e6330
--- /dev/null
+++ b/Xcode/libusbmuxd.xcodeproj/xcuserdata/olunx.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>libusbmuxd.xcscheme</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>18</integer>
+		</dict>
+	</dict>
+	<key>SuppressBuildableAutocreation</key>
+	<dict>
+		<key>C847BE781A751F2A00271179</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/src/libusbmuxd.c b/src/libusbmuxd.c
index f7508c5..aa53a70 100644
--- a/src/libusbmuxd.c
+++ b/src/libusbmuxd.c
@@ -824,7 +824,9 @@ USBMUXD_API int usbmuxd_unsubscribe()
 #else
 	res = pthread_kill(devmon, 0);
 	if (res == 0) {
-		pthread_cancel(devmon);
+#ifndef __ANDROID__
+        pthread_cancel(devmon);
+#endif
 		res = pthread_join(devmon, NULL);
 	}
 	if ((res != 0) && (res != ESRCH)) {