diff --git a/demos/dialog/animated.html b/demos/dialog/animated.html
index e8cf6d336..e54807f29 100644
--- a/demos/dialog/animated.html
+++ b/demos/dialog/animated.html
@@ -7,14 +7,14 @@
 	<script type="text/javascript" src="../../ui/ui.core.js"></script>
 	<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
 	<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
+	<script type="text/javascript" src="../../ui/ui.stackfix.js"></script>
 	<script type="text/javascript" src="../../ui/ui.dialog.js"></script>
 	<script type="text/javascript" src="../../ui/effects.core.js"></script>
 	<script type="text/javascript" src="../../ui/effects.blind.js"></script>
 	<script type="text/javascript" src="../../ui/effects.explode.js"></script>
-	<script type="text/javascript" src="../../external/jquery.bgiframe-2.1.1.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<script type="text/javascript">
-	$.ui.dialog.defaults.bgiframe = true;
+	$.ui.dialog.defaults.stackfix = true;
 	// increase the default animation speed to exaggerate the effect
 	$.fx.speeds._default = 1000;
 	$(function() {
diff --git a/demos/dialog/default.html b/demos/dialog/default.html
index b76cc5410..eccf21732 100644
--- a/demos/dialog/default.html
+++ b/demos/dialog/default.html
@@ -8,10 +8,9 @@
 	<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
 	<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
 	<script type="text/javascript" src="../../ui/ui.dialog.js"></script>
-	<script type="text/javascript" src="../../external/jquery.bgiframe-2.1.1.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<script type="text/javascript">
-	$.ui.dialog.defaults.bgiframe = true;
+	$.ui.dialog.defaults.stackfix = true;
 	$(function() {
 		$("#dialog").dialog();
 	});
diff --git a/demos/dialog/modal-confirmation.html b/demos/dialog/modal-confirmation.html
index 782ca5864..a5f6a1b26 100644
--- a/demos/dialog/modal-confirmation.html
+++ b/demos/dialog/modal-confirmation.html
@@ -7,13 +7,13 @@
 	<script type="text/javascript" src="../../ui/ui.core.js"></script>
 	<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
 	<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
+	<script type="text/javascript" src="../../ui/ui.stackfix.js"></script>
 	<script type="text/javascript" src="../../ui/ui.dialog.js"></script>
-	<script type="text/javascript" src="../../external/jquery.bgiframe-2.1.1.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<script type="text/javascript">
 	$(function() {
 		$("#dialog").dialog({
-			bgiframe: true,
+			stackfix: true,
 			resizable: false,
 			height:140,
 			modal: true,
diff --git a/demos/dialog/modal-form.html b/demos/dialog/modal-form.html
index da95b1278..a40a8f4d0 100644
--- a/demos/dialog/modal-form.html
+++ b/demos/dialog/modal-form.html
@@ -7,10 +7,10 @@
 	<script type="text/javascript" src="../../ui/ui.core.js"></script>
 	<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
 	<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
+	<script type="text/javascript" src="../../ui/ui.stackfix.js"></script>
 	<script type="text/javascript" src="../../ui/ui.dialog.js"></script>
 	<script type="text/javascript" src="../../ui/effects.core.js"></script>
 	<script type="text/javascript" src="../../ui/effects.highlight.js"></script>
-	<script type="text/javascript" src="../../external/jquery.bgiframe-2.1.1.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 		body { font-size: 62.5%; }
@@ -64,7 +64,7 @@
 		}
 		
 		$("#dialog").dialog({
-			bgiframe: true,
+			stackfix: true,
 			autoOpen: false,
 			height: 300,
 			modal: true,
diff --git a/demos/dialog/modal-message.html b/demos/dialog/modal-message.html
index 46b545f1c..24db34239 100644
--- a/demos/dialog/modal-message.html
+++ b/demos/dialog/modal-message.html
@@ -7,13 +7,13 @@
 	<script type="text/javascript" src="../../ui/ui.core.js"></script>
 	<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
 	<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
+	<script type="text/javascript" src="../../ui/ui.stackfix.js"></script>
 	<script type="text/javascript" src="../../ui/ui.dialog.js"></script>
-	<script type="text/javascript" src="../../external/jquery.bgiframe-2.1.1.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<script type="text/javascript">
 	$(function() {
 		$("#dialog").dialog({
-			bgiframe: true,
+			stackfix: true,
 			modal: true,
 			buttons: {
 				Ok: function() {
diff --git a/demos/dialog/modal.html b/demos/dialog/modal.html
index 32cd29e01..297b77a63 100644
--- a/demos/dialog/modal.html
+++ b/demos/dialog/modal.html
@@ -7,13 +7,13 @@
 	<script type="text/javascript" src="../../ui/ui.core.js"></script>
 	<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
 	<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
+	<script type="text/javascript" src="../../ui/ui.stackfix.js"></script>
 	<script type="text/javascript" src="../../ui/ui.dialog.js"></script>
-	<script type="text/javascript" src="../../external/jquery.bgiframe-2.1.1.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<script type="text/javascript">
 	$(function() {
 		$("#dialog").dialog({
-			bgiframe: true,
+			stackfix: true,
 			height: 140,
 			modal: true
 		});
diff --git a/demos/index.html b/demos/index.html
index a11b45234..d98e59ff6 100644
--- a/demos/index.html
+++ b/demos/index.html
@@ -6,8 +6,8 @@
 	<link type="text/css" href="../themes/base/ui.all.css" rel="stylesheet" />
 	<link type="text/css" href="demos.css" rel="stylesheet" />
 	<script type="text/javascript" src="../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../external/jquery.bgiframe-2.1.1.js"></script>
 	<script type="text/javascript" src="../ui/ui.core.js"></script>
+	<script type="text/javascript" src="../ui/ui.stackfix.js"></script>
 	<script type="text/javascript" src="../ui/ui.accordion.js"></script>
 	<script type="text/javascript" src="../ui/ui.datepicker.js"></script>
 	<script type="text/javascript" src="../ui/ui.dialog.js"></script>
diff --git a/external/jquery.bgiframe-2.1.1.js b/external/jquery.bgiframe-2.1.1.js
deleted file mode 100644
index 9ed4b33d7..000000000
--- a/external/jquery.bgiframe-2.1.1.js
+++ /dev/null
@@ -1,100 +0,0 @@
-/* Copyright (c) 2006 Brandon Aaron (http://brandonaaron.net)
- * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) 
- * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses.
- *
- * $LastChangedDate: 2007-07-21 18:44:59 -0500 (Sat, 21 Jul 2007) $
- * $Rev: 2446 $
- *
- * Version 2.1.1
- */
-
-(function($){
-
-/**
- * The bgiframe is chainable and applies the iframe hack to get 
- * around zIndex issues in IE6. It will only apply itself in IE6 
- * and adds a class to the iframe called 'bgiframe'. The iframe
- * is appeneded as the first child of the matched element(s) 
- * with a tabIndex and zIndex of -1.
- * 
- * By default the plugin will take borders, sized with pixel units,
- * into account. If a different unit is used for the border's width,
- * then you will need to use the top and left settings as explained below.
- *
- * NOTICE: This plugin has been reported to cause perfromance problems
- * when used on elements that change properties (like width, height and
- * opacity) a lot in IE6. Most of these problems have been caused by 
- * the expressions used to calculate the elements width, height and 
- * borders. Some have reported it is due to the opacity filter. All 
- * these settings can be changed if needed as explained below.
- *
- * @example $('div').bgiframe();
- * @before <div><p>Paragraph</p></div>
- * @result <div><iframe class="bgiframe".../><p>Paragraph</p></div>
- *
- * @param Map settings Optional settings to configure the iframe.
- * @option String|Number top The iframe must be offset to the top
- * 		by the width of the top border. This should be a negative 
- *      number representing the border-top-width. If a number is 
- * 		is used here, pixels will be assumed. Otherwise, be sure
- *		to specify a unit. An expression could also be used. 
- * 		By default the value is "auto" which will use an expression 
- * 		to get the border-top-width if it is in pixels.
- * @option String|Number left The iframe must be offset to the left
- * 		by the width of the left border. This should be a negative 
- *      number representing the border-left-width. If a number is 
- * 		is used here, pixels will be assumed. Otherwise, be sure
- *		to specify a unit. An expression could also be used. 
- * 		By default the value is "auto" which will use an expression 
- * 		to get the border-left-width if it is in pixels.
- * @option String|Number width This is the width of the iframe. If
- *		a number is used here, pixels will be assume. Otherwise, be sure
- * 		to specify a unit. An experssion could also be used.
- *		By default the value is "auto" which will use an experssion
- * 		to get the offsetWidth.
- * @option String|Number height This is the height of the iframe. If
- *		a number is used here, pixels will be assume. Otherwise, be sure
- * 		to specify a unit. An experssion could also be used.
- *		By default the value is "auto" which will use an experssion
- * 		to get the offsetHeight.
- * @option Boolean opacity This is a boolean representing whether or not
- * 		to use opacity. If set to true, the opacity of 0 is applied. If
- *		set to false, the opacity filter is not applied. Default: true.
- * @option String src This setting is provided so that one could change 
- *		the src of the iframe to whatever they need.
- *		Default: "javascript:false;"
- *
- * @name bgiframe
- * @type jQuery
- * @cat Plugins/bgiframe
- * @author Brandon Aaron (brandon.aaron@gmail.com || http://brandonaaron.net)
- */
-$.fn.bgIframe = $.fn.bgiframe = function(s) {
-	// This is only for IE6
-	if ( $.browser.msie && /6.0/.test(navigator.userAgent) ) {
-		s = $.extend({
-			top     : 'auto', // auto == .currentStyle.borderTopWidth
-			left    : 'auto', // auto == .currentStyle.borderLeftWidth
-			width   : 'auto', // auto == offsetWidth
-			height  : 'auto', // auto == offsetHeight
-			opacity : true,
-			src     : 'javascript:false;'
-		}, s || {});
-		var prop = function(n){return n&&n.constructor==Number?n+'px':n;},
-		    html = '<iframe class="bgiframe"frameborder="0"tabindex="-1"src="'+s.src+'"'+
-		               'style="display:block;position:absolute;z-index:-1;'+
-			               (s.opacity !== false?'filter:Alpha(Opacity=\'0\');':'')+
-					       'top:'+(s.top=='auto'?'expression(((parseInt(this.parentNode.currentStyle.borderTopWidth)||0)*-1)+\'px\')':prop(s.top))+';'+
-					       'left:'+(s.left=='auto'?'expression(((parseInt(this.parentNode.currentStyle.borderLeftWidth)||0)*-1)+\'px\')':prop(s.left))+';'+
-					       'width:'+(s.width=='auto'?'expression(this.parentNode.offsetWidth+\'px\')':prop(s.width))+';'+
-					       'height:'+(s.height=='auto'?'expression(this.parentNode.offsetHeight+\'px\')':prop(s.height))+';'+
-					'"/>';
-		return this.each(function() {
-			if ( $('> iframe.bgiframe', this).length == 0 )
-				this.insertBefore( document.createElement(html), this.firstChild );
-		});
-	}
-	return this;
-};
-
-})(jQuery);
\ No newline at end of file
diff --git a/ui/ui.dialog.js b/ui/ui.dialog.js
index dc10b075d..da7c677c1 100644
--- a/ui/ui.dialog.js
+++ b/ui/ui.dialog.js
@@ -134,7 +134,7 @@ $.widget("ui.dialog", {
 		self._createButtons(options.buttons);
 		self._isOpen = false;
 
-		(options.bgiframe && $.fn.bgiframe && uiDialog.bgiframe());
+		(options.stackfix && $.fn.stackfix && uiDialog.stackfix());
 		(options.autoOpen && self.open());
 	},
 
@@ -526,7 +526,7 @@ $.extend($.ui.dialog, {
 	version: "@VERSION",
 	defaults: {
 		autoOpen: true,
-		bgiframe: false,
+		stackfix: false,
 		buttons: {},
 		closeOnEscape: true,
 		closeText: 'close',
@@ -596,7 +596,7 @@ $.extend($.ui.dialog.overlay, {
 				height: this.height()
 			});
 
-		(dialog.options.bgiframe && $.fn.bgiframe && $el.bgiframe());
+		(dialog.options.stackfix && $.fn.stackfix && $el.stackfix());
 
 		this.instances.push($el);
 		return $el;
diff --git a/ui/ui.stackfix.js b/ui/ui.stackfix.js
new file mode 100644
index 000000000..e789e829c
--- /dev/null
+++ b/ui/ui.stackfix.js
@@ -0,0 +1,46 @@
+/*
+ * jQuery UI Stackfix @VERSION
+ *
+ * Copyright (c) 2008 Brandon Aaron (http://brandonaaron.net)
+ * to be replaced with...?
+ * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
+ * 
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://docs.jquery.com/Plugins/bgiframe
+ * to be moved to...?
+ * http://docs.jquery.com/UI/Stackfix
+ *
+ */
+
+(function($){
+
+// This is only for IE6
+$.fn.stackfix = $.browser.msie && /6.0/.test(navigator.userAgent) ? function(s) {
+	s = $.extend({
+		top     : 'auto', // auto == .currentStyle.borderTopWidth
+		left    : 'auto', // auto == .currentStyle.borderLeftWidth
+		width   : 'auto', // auto == offsetWidth
+		height  : 'auto', // auto == offsetHeight
+		opacity : true,
+		src     : 'javascript:false;'
+	}, s || {});
+	var prop = function(n){return n&&n.constructor==Number?n+'px':n;},
+	    html = '<iframe class="ui-stackfix"frameborder="0"tabindex="-1"src="'+s.src+'"'+
+	               'style="display:block;position:absolute;z-index:-1;'+
+		               (s.opacity !== false?'filter:Alpha(Opacity=\'0\');':'')+
+				       'top:'+(s.top=='auto'?'expression(((parseInt(this.parentNode.currentStyle.borderTopWidth)||0)*-1)+\'px\')':prop(s.top))+';'+
+				       'left:'+(s.left=='auto'?'expression(((parseInt(this.parentNode.currentStyle.borderLeftWidth)||0)*-1)+\'px\')':prop(s.left))+';'+
+				       'width:'+(s.width=='auto'?'expression(this.parentNode.offsetWidth+\'px\')':prop(s.width))+';'+
+				       'height:'+(s.height=='auto'?'expression(this.parentNode.offsetHeight+\'px\')':prop(s.height))+';'+
+				'"/>';
+	return this.each(function() {
+		if ( $('> iframe.ui-stackfix', this).length == 0 )
+			this.insertBefore( document.createElement(html), this.firstChild );
+	});
+} : function() {
+	return this;
+};
+
+})(jQuery);
\ No newline at end of file