diff --git a/experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig b/experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig
new file mode 100644
index 0000000..f209e4a
--- /dev/null
+++ b/experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig
@@ -0,0 +1,16 @@
+//
+//  SkiOSSampleApp-Base.xcconfig
+//  iOSSampleApp
+//
+//  Created by Yang Su on 6/30/11.
+//  Copyright 2011 Google Inc. All rights reserved.
+//
+
+ARCHS=armv6
+IPHONEOS_DEPLOYMENT_TARGET=4.0
+SDKROOT=iphoneos
+TARGETED_DEVICE_FAMILY=1,2
+
+USER_HEADER_SEARCH_PATHS=../../gpu/include/** ../../include/**
+CODE_SIGN_IDENTITY=iPhone Developer
+
diff --git a/experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig b/experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig
new file mode 100644
index 0000000..63ea57f
--- /dev/null
+++ b/experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig
@@ -0,0 +1,11 @@
+//
+//  SkiOSSampleApp.xcconfig
+//  iOSSampleApp
+//
+//  Created by Yang Su on 6/30/11.
+//  Copyright 2011 Google Inc. All rights reserved.
+//
+#include "SkiOSSampleApp-Base"
+
+GCC_PREPROCESSOR_DEFINITIONS=SK_DEBUG SK_BUILD_FOR_IOS
+GCC_OPTIMIZATION_LEVEL=0
diff --git a/experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig b/experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig
new file mode 100644
index 0000000..6acdbc3
--- /dev/null
+++ b/experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig
@@ -0,0 +1,10 @@
+//
+//  SkiOSSampleApp-Release.xcconfig
+//  iOSSampleApp
+//
+//  Created by Yang Su on 6/30/11.
+//  Copyright 2011 Google Inc. All rights reserved.
+//
+#include "SkiOSSampleApp-Base"
+GCC_PREPROCESSOR_DEFINITIONS=SK_RELEASE SK_BUILD_FOR_IOS
+GCC_OPTIMIZATION_LEVEL=s
diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp
index 0c4c04c..a0c98a8 100644
--- a/gyp/SampleApp.gyp
+++ b/gyp/SampleApp.gyp
@@ -1,3 +1,4 @@
+
 {
   'includes': [
     'common.gypi',
@@ -110,7 +111,7 @@
         '../samplecode/SampleXfermodes.cpp',
         '../samplecode/SampleXfermodesBlur.cpp',
         
-        # Dependecies for the pipe code in SampleApp
+        # Dependencies for the pipe code in SampleApp
         '../src/pipe/SkGPipeRead.cpp',
         '../src/pipe/SkGPipeWrite.cpp',
       ],
@@ -152,6 +153,47 @@
             '../samplecode/SampleDecode.cpp',
           ],
         }],
+        [ 'skia_os == "ios"', {
+          # TODO: This doesn't build properly yet, but it's getting there.
+          'sources!': [
+            '../samplecode/SampleDecode.cpp',
+          ],
+          'sources': [
+            '../experimental/iOSSampleApp/SkIOSNotifier.mm',
+            '../experimental/iOSSampleApp/SkTime_iOS.mm',
+            '../experimental/iOSSampleApp/SkUIDetailViewController.mm',
+            '../experimental/iOSSampleApp/SkUIRootViewController.mm',
+            '../experimental/iOSSampleApp/SkUIView_shell.mm',
+
+            '../experimental/iOSSampleApp/iOSSampleApp_Prefix.pch',
+            '../experimental/iOSSampleApp/Shared/main.m',
+            '../experimental/iOSSampleApp/iPad/AppDelegate_iPad.mm',
+            '../experimental/iOSSampleApp/iPad/SkUISplitViewController.mm',
+            '../experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.mm',
+            '../experimental/iOSSampleApp/iPhone/SkUINavigationController.mm',
+
+            '../src/utils/ios/SkOSWindow_iOS.mm',
+            '../src/utils/ios/SkImageDecoder_iOS.mm',
+            '../src/utils/ios/SkStream_NSData.mm',
+            '../src/utils/ios/SkOSFile_iOS.mm',
+
+            '../src/utils/mac/SkCreateCGImageRef.cpp',
+            '../experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig',
+            '../experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig',
+          ],
+          'include_dirs' : [
+            '../experimental/iOSSampleApp',
+            '../experimental/iOSSampleApp/iPad',
+            '../experimental/iOSSampleApp/iPhone',
+            '../include/utils/ios',
+            '../../gpu/include',
+          ],
+          'xcode_config_file': '../experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig',
+          'mac_bundle_resources' : [
+            '../experimental/iOSSampleApp/iPad/MainWindow_iPad.xib',
+            '../experimental/iOSSampleApp/iPhone/MainWindow_iPhone.xib',
+          ],
+        }],
 
       ],
       'msvs_settings': {
diff --git a/gyp/common.gypi b/gyp/common.gypi
index a9b0b53..6991908 100644
--- a/gyp/common.gypi
+++ b/gyp/common.gypi
@@ -157,6 +157,25 @@
         },
       ],
 
+      ['skia_os == "ios"', 
+        {
+          'defines': [
+            'SK_BUILD_FOR_IOS',
+          ],
+          'configurations': {
+            'Debug': {
+              'cflags': ['-g']
+            },
+            'Release': {
+              'cflags': ['-O2']
+            },
+          },
+          'xcode_settings': {
+            'SYMROOT': '<(DEPTH)/xcodebuild',
+          },
+        },
+      ],
+
     ], # end 'conditions'
   }, # end 'target_defaults'
 }
diff --git a/gyp/core.gyp b/gyp/core.gyp
index 51d3066..55819c4 100644
--- a/gyp/core.gyp
+++ b/gyp/core.gyp
@@ -296,6 +296,32 @@
             ],
           },
         }],
+        [ 'skia_os == "ios"', {
+          'include_dirs': [
+            '../include/utils/ios',
+          ],
+          'sources': [
+            '../include/core/SkMMapStream.h',
+            '../include/utils/mac/SkCGUtils.h',
+
+            '../src/core/SkMMapStream.cpp',
+            '../src/ports/SkFontHost_mac_coretext.cpp',
+
+            '../src/ports/SkThread_pthread.cpp',
+            '../src/ports/SkTime_Unix.cpp',
+          ],
+          'link_settings': {
+            'libraries': [
+              '/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk/System/Library/Frameworks/CoreFoundation.framework',
+              '/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk/System/Library/Frameworks/CoreGraphics.framework',
+              '/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk/System/Library/Frameworks/CoreText.framework',
+              '/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk/System/Library/Frameworks/UIKit.framework',
+              '/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk/System/Library/Frameworks/Foundation.framework',
+              '/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk/System/Library/Frameworks/QuartzCore.framework',
+              '/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk/System/Library/Frameworks/OpenGLES.framework',
+            ],
+          },
+        }],
         [ 'skia_os == "win"', {
           'include_dirs': [
             'config/win',