diff --git a/plugin.xml b/plugin.xml
index 35a143b..f702dc5 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -7,23 +7,28 @@ id="org.apache.cordova.core.InAppBrowser"
     <name>InAppBrowser</name>
 
     <js-module src="www/InAppBrowser.js" name="InAppBrowser">
-        <clobbers target="window.InAppBrowser" />
+        <clobbers target="window.open" />
     </js-module>
     
     <!-- android -->
     <platform name="android">
-        <config-file target="res/xml/config.xml" parent="/cordova/plugins">
-            <plugin name="InAppBrowser" value="org.apache.cordova.core.InAppBrowser"/>
+        <config-file target="res/xml/config.xml" parent="/*">
+            <feature name="InAppBrowser"> 
+                <param name="android-package" value="org.apache.cordova.core.InAppBrowser"/>
+            </feature>
         </config-file>
 
-        <source-file src="InAppBrowser.java" target-dir="org/apache/cordova/core" />
+        <source-file src="src/android/InAppBrowser.java" target-dir="org/apache/cordova/core" />
     </platform>
     
     <!-- ios -->
     <platform name="ios">    
-        <config-file target="config.xml" parent="plugins">
-	        <plugin name="InAppBrowser" value="CDVInAppBrowser" /> 
+        <config-file target="config.xml" parent="/*">
+            <feature name="InAppBrowser">
+                <param name="ios-package" value="CDVInAppBrowser" /> 
+            </feature>
         </config-file>
+
         <header-file src="src/ios/CDVInAppBrowser.h" />
 	    <source-file src="src/ios/CDVInAppBrowser.m" />
     </platform>
diff --git a/src/android/InAppBrowser.java b/src/android/InAppBrowser.java
index b60ec3b..a423e1e 100644
--- a/src/android/InAppBrowser.java
+++ b/src/android/InAppBrowser.java
@@ -21,8 +21,6 @@ package org.apache.cordova.core;
 import java.util.HashMap;
 import java.util.StringTokenizer;
 
-import org.apache.cordova.Config;
-import org.apache.cordova.CordovaWebView;
 import org.apache.cordova.api.CallbackContext;
 import org.apache.cordova.api.CordovaPlugin;
 import org.apache.cordova.api.LOG;
diff --git a/src/ios/CDVInAppBrowser.h b/src/ios/CDVInAppBrowser.h
index f87baff..0352144 100644
--- a/src/ios/CDVInAppBrowser.h
+++ b/src/ios/CDVInAppBrowser.h
@@ -17,10 +17,10 @@
  under the License.
  */
 
-#import "CDVPlugin.h"
-#import "CDVInvokedUrlCommand.h"
-#import "CDVScreenOrientationDelegate.h"
-#import "CDVWebViewDelegate.h"
+#import <Cordova/CDVPlugin.h>
+#import <Cordova/CDVInvokedUrlCommand.h>
+#import <Cordova/CDVScreenOrientationDelegate.h>
+#import <Cordova/CDVWebViewDelegate.h>
 
 @class CDVInAppBrowserViewController;
 
diff --git a/src/ios/CDVInAppBrowser.m b/src/ios/CDVInAppBrowser.m
index d5f06ec..d7c51c2 100644
--- a/src/ios/CDVInAppBrowser.m
+++ b/src/ios/CDVInAppBrowser.m
@@ -18,9 +18,9 @@
  */
 
 #import "CDVInAppBrowser.h"
-#import "CDVPluginResult.h"
-#import "CDVUserAgentUtil.h"
-#import "CDVJSON.h"
+#import <Cordova/CDVPluginResult.h>
+#import <Cordova/CDVUserAgentUtil.h>
+#import <Cordova/CDVJSON.h>
 
 #define    kInAppBrowserTargetSelf @"_self"
 #define    kInAppBrowserTargetSystem @"_system"