diff --git a/README.md b/README.md
index 3e85d8c1bf..6d719c423b 100644
--- a/README.md
+++ b/README.md
@@ -153,6 +153,7 @@ sudo ruby -e "$(curl -fsSL https://raw.githubusercontent.com/NativeScript/native
 * For iOS development
 	* [Latest Xcode][12]
 	* [Xcode command-line tools][12]
+	* [xcodeproj ruby gem][13]
 	* (Optional) [CocoaPods 0.38.2][CocoaPods 0.38.2]
 * For Android development
 	* [JDK 8][JDK 8] or a later stable official release
@@ -601,6 +602,7 @@ This software is licensed under the Apache 2.0 license, quoted <a href="LICENSE"
 [10]: http://developer.telerik.com/featured/nativescript-android/
 [11]: http://blogs.telerik.com/valentinstoychev/posts.aspx/14-06-12/announcing-nativescript---cross-platform-framework-for-building-native-mobile-applications
 [12]: https://developer.apple.com/xcode/downloads/
+[13]: https://rubygems.org/gems/xcodeproj/versions/0.28.2
 [Chocolatey]: https://chocolatey.org/
 [JDK 8]: http://www.oracle.com/technetwork/java/javase/downloads/index.html
 [Android SDK 22]: http://developer.android.com/sdk/index.html
diff --git a/lib/common b/lib/common
index 59f26c5cd1..0060d2f1a8 160000
--- a/lib/common
+++ b/lib/common
@@ -1 +1 @@
-Subproject commit 59f26c5cd1b6bce86d6a2817707d20aa0f66fecc
+Subproject commit 0060d2f1a8e6a9361dff082108aef9437f49eb37
diff --git a/lib/services/doctor-service.ts b/lib/services/doctor-service.ts
index 6632dea4af..a8fb7bbd6a 100644
--- a/lib/services/doctor-service.ts
+++ b/lib/services/doctor-service.ts
@@ -20,6 +20,7 @@ class DoctorService implements IDoctorService {
 		private $hostInfo: IHostInfo,
 		private $logger: ILogger,
 		private $progressIndicator: IProgressIndicator,
+		private $staticConfig: IStaticConfig,
 		private $sysInfo: ISysInfo,
 		private $childProcess: IChildProcess,
 		private $config: IConfiguration,
@@ -32,7 +33,7 @@ class DoctorService implements IDoctorService {
 	public printWarnings(configOptions?: { trackResult: boolean }): IFuture<boolean> {
 		return (() => {
 			let result = false;
-			let sysInfo = this.$sysInfo.getSysInfo(path.join(__dirname, "..", "..", "package.json")).wait();
+			let sysInfo = this.$sysInfo.getSysInfo(this.$staticConfig.pathToPackageJson).wait();
 
 			if (!sysInfo.adbVer) {
 				this.$logger.warn("WARNING: adb from the Android SDK is not installed or is not configured properly.");
@@ -64,6 +65,13 @@ class DoctorService implements IDoctorService {
 					result = true;
 				}
 
+				if (!sysInfo.xcodeprojGemLocation) {
+					this.$logger.warn("WARNING: xcodeproj gem is not installed or is not configured properly.");
+					this.$logger.out("You will not be able to build your projects for iOS." + EOL
+						+ "To be able to build for iOS and run apps in the native emulator, verify that you have installed xcodeproj." + EOL);
+					result = true;
+				}
+
 				if (!sysInfo.cocoapodVer) {
 					this.$logger.warn("WARNING: CocoaPods is not installed or is not configured properly.");
 					this.$logger.out("You will not be able to build your projects for iOS if they contain plugin with CocoaPod file." + EOL
diff --git a/setup/native-script.rb b/setup/native-script.rb
index 2898d00af7..514074aa84 100644
--- a/setup/native-script.rb
+++ b/setup/native-script.rb
@@ -108,6 +108,7 @@ def install(program_name, message, script, run_as_root = false, show_all_option
 
 # the -p flag is set in order to ensure zero status code even if the directory exists
 execute("mkdir -p ~/.cocoapods", "There was a problem in creating ~/.cocoapods directory")
+install("xcodeproj", "Installing xcodeproj... This might take some time, please, be patient.", 'gem install xcodeproj -V', true)
 install("CocoaPods", "Installing CocoaPods... This might take some time, please, be patient.", 'gem install cocoapods -V', true)
 
 puts "Configuring your system for Android development... This might take some time, please, be patient."