diff --git a/demos/droppable/accept.html b/demos/droppable/accept.html
new file mode 100644
index 000000000..a4ccfee87
--- /dev/null
+++ b/demos/droppable/accept.html
@@ -0,0 +1,49 @@
+<!doctype html>
+<html lang="en">
+<head>
+	<title>jQuery UI Droppable - accept</title>
+	<link type="text/css" href="../demos.css" rel="stylesheet" />
+	<link type="text/css" href="../../themes/default/ui.all.css" rel="stylesheet" />
+	<script type="text/javascript" src="../../jquery-1.2.6.js"></script>
+	<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.droppable.js"></script>
+	<style type="text/css">
+	.ui-widget-header { width: 150px; height: 150px; padding: 0.5em; float: left; margin: 10px; }
+	.ui-widget-content { width: 100px; height: 100px; padding: 0.5em; float: left; margin: 10px; }
+	</style>
+	<script type="text/javascript">
+	$(function() {
+		
+		$("#draggable,#draggable-nonvalid").draggable();
+		
+		$("#droppable").droppable({
+			accept: '#draggable',
+			activeClass: 'ui-state-hover',
+			hoverClass: 'ui-state-active',
+			drop: function(event, ui) {
+				$(this).addClass('ui-state-highlight').find('p').html('Dropped!');
+			}
+		});
+		
+	});
+	</script>
+</head>
+<body>
+
+<div id="draggable-nonvalid" class="ui-widget-content">
+	<p>I'm draggable but can't be dropped</p>
+</div>
+
+<div id="draggable" class="ui-widget-content">
+	<p>Drag me to my target</p>
+</div>
+
+
+
+<div id="droppable" class="ui-widget-header">
+	<p>accept: '#draggable'</p>
+</div>
+
+</body>
+</html>
diff --git a/demos/droppable/activeclass.html b/demos/droppable/activeclass.html
new file mode 100644
index 000000000..97cdee0da
--- /dev/null
+++ b/demos/droppable/activeclass.html
@@ -0,0 +1,40 @@
+<!doctype html>
+<html lang="en">
+<head>
+	<title>jQuery UI Droppable - activeClass</title>
+	<link type="text/css" href="../demos.css" rel="stylesheet" />
+	<link type="text/css" href="../../themes/default/ui.all.css" rel="stylesheet" />
+	<script type="text/javascript" src="../../jquery-1.2.6.js"></script>
+	<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.droppable.js"></script>
+	<style type="text/css">
+	.ui-widget-header { width: 150px; height: 150px; padding: 0.5em; float: left; margin: 10px; }
+	.ui-widget-content { width: 100px; height: 100px; padding: 0.5em; float: left; margin: 10px; }
+	</style>
+	<script type="text/javascript">
+	$(function() {
+		$("#draggable").draggable();
+		$("#droppable").droppable({
+			activeClass: 'ui-state-hover',
+			hoverClass: 'ui-state-active',
+			drop: function(event, ui) {
+				$(this).addClass('ui-state-highlight').find('p').html('Dropped!');
+			}
+		});
+		
+	});
+	</script>
+</head>
+<body>
+
+<div id="draggable" class="ui-widget-content">
+	<p>Drag me to my target</p>
+</div>
+
+<div id="droppable" class="ui-widget-header">
+	<p>Drop here</p>
+</div>
+
+</body>
+</html>
diff --git a/demos/droppable/default.html b/demos/droppable/default.html
new file mode 100644
index 000000000..122f57e14
--- /dev/null
+++ b/demos/droppable/default.html
@@ -0,0 +1,38 @@
+<!doctype html>
+<html lang="en">
+<head>
+	<title>jQuery UI Droppable - Default Demo</title>
+	<link type="text/css" href="../demos.css" rel="stylesheet" />
+	<link type="text/css" href="../../themes/default/ui.all.css" rel="stylesheet" />
+	<script type="text/javascript" src="../../jquery-1.2.6.js"></script>
+	<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.droppable.js"></script>
+	<style type="text/css">
+	.ui-widget-header { width: 150px; height: 150px; padding: 0.5em; float: left; margin: 10px; }
+	.ui-widget-content { width: 100px; height: 100px; padding: 0.5em; float: left; margin: 10px; }
+	</style>
+	<script type="text/javascript">
+	$(function() {
+		$("#draggable").draggable();
+		$("#droppable").droppable({
+			drop: function(event, ui) {
+				$(this).addClass('ui-state-highlight').find('p').html('Dropped!');
+			}
+		});
+		
+	});
+	</script>
+</head>
+<body>
+
+<div id="draggable" class="ui-widget-content">
+	<p>Drag me to my target</p>
+</div>
+
+<div id="droppable" class="ui-widget-header">
+	<p>Drop here</p>
+</div>
+
+</body>
+</html>
diff --git a/demos/droppable/greedy.html b/demos/droppable/greedy.html
new file mode 100644
index 000000000..1ccf6277a
--- /dev/null
+++ b/demos/droppable/greedy.html
@@ -0,0 +1,64 @@
+<!doctype html>
+<html lang="en">
+<head>
+	<title>jQuery UI Droppable - greedy</title>
+	<link type="text/css" href="../demos.css" rel="stylesheet" />
+	<link type="text/css" href="../../themes/default/ui.all.css" rel="stylesheet" />
+	<script type="text/javascript" src="../../jquery-1.2.6.js"></script>
+	<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.droppable.js"></script>
+	<style type="text/css">
+	#droppable,#droppable2 { width: 200px; height: 160px; padding: 0.5em; float: left; margin: 10px; }
+	#droppable-inner,#droppable2-inner { width: 140px; height: 100px; padding: 0.5em; float: left; margin: 10px; }
+	.ui-widget-content { width: 100px; height: 100px; padding: 0.5em; float: left; margin: 10px; }
+	</style>
+	<script type="text/javascript">
+	$(function() {
+		
+		$("#draggable").draggable();
+		
+		$("#droppable, #droppable-inner").droppable({
+			activeClass: 'ui-state-hover',
+			hoverClass: 'ui-state-active',
+			drop: function(event, ui) {
+				$(this).addClass('ui-state-highlight').find('p').html('Dropped!');
+			}
+		});
+		
+		$("#droppable2, #droppable2-inner").droppable({
+			greedy: true,
+			activeClass: 'ui-state-hover',
+			hoverClass: 'ui-state-active',
+			drop: function(event, ui) {
+				$(this).addClass('ui-state-highlight').find('p').html('Dropped!');
+			}
+		});
+		
+	});
+	</script>
+</head>
+<body>
+
+<div id="draggable" class="ui-widget-content">
+	<p>Drag me to my target</p>
+</div>
+
+
+
+<div id="droppable" class="ui-widget-header">
+	<p>Outer droppable (greedy deactivated)</p>
+	<div id="droppable-inner" class="ui-widget-header">
+		<p>Inner droppable (greedy deactivated)</p>
+	</div>
+</div>
+
+<div id="droppable2" class="ui-widget-header">
+	<p>Outer droppable (greedy deactivated)</p>
+	<div id="droppable2-inner" class="ui-widget-header">
+		<p>Inner droppable (greedy deactivated)</p>
+	</div>
+</div>
+
+</body>
+</html>
diff --git a/demos/droppable/hoverclass.html b/demos/droppable/hoverclass.html
new file mode 100644
index 000000000..d71abd42e
--- /dev/null
+++ b/demos/droppable/hoverclass.html
@@ -0,0 +1,39 @@
+<!doctype html>
+<html lang="en">
+<head>
+	<title>jQuery UI Droppable - hoverClass</title>
+	<link type="text/css" href="../demos.css" rel="stylesheet" />
+	<link type="text/css" href="../../themes/default/ui.all.css" rel="stylesheet" />
+	<script type="text/javascript" src="../../jquery-1.2.6.js"></script>
+	<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.droppable.js"></script>
+	<style type="text/css">
+	.ui-widget-header { width: 150px; height: 150px; padding: 0.5em; float: left; margin: 10px; }
+	.ui-widget-content { width: 100px; height: 100px; padding: 0.5em; float: left; margin: 10px; }
+	</style>
+	<script type="text/javascript">
+	$(function() {
+		$("#draggable").draggable();
+		$("#droppable").droppable({
+			hoverClass: 'ui-state-active',
+			drop: function(event, ui) {
+				$(this).addClass('ui-state-highlight').find('p').html('Dropped!');
+			}
+		});
+		
+	});
+	</script>
+</head>
+<body>
+
+<div id="draggable" class="ui-widget-content">
+	<p>Drag me to my target</p>
+</div>
+
+<div id="droppable" class="ui-widget-header">
+	<p>Drop here</p>
+</div>
+
+</body>
+</html>
diff --git a/demos/droppable/index.html b/demos/droppable/index.html
index 15b655119..f969f49e9 100644
--- a/demos/droppable/index.html
+++ b/demos/droppable/index.html
@@ -10,6 +10,11 @@
 	<h4>Droppable</h4>
 	<ul>
 		<li class="demo-config-on"><a href="default.html">Default</a></li>
+		<li><a href="accept.html">accept</a></li>
+		<li><a href="hoverclass.html">hoverClass</a></li>
+		<li><a href="activeclass.html">activeClass</a></li>
+		<li><a href="greedy.html">greedy</a></li>
+		<li><a href="tolerance.html">tolerance</a></li>
 	</ul>
 </div>
 
diff --git a/demos/droppable/tolerance.html b/demos/droppable/tolerance.html
new file mode 100644
index 000000000..9f08934d8
--- /dev/null
+++ b/demos/droppable/tolerance.html
@@ -0,0 +1,83 @@
+<!doctype html>
+<html lang="en">
+<head>
+	<title>jQuery UI Droppable - tolerance</title>
+	<link type="text/css" href="../demos.css" rel="stylesheet" />
+	<link type="text/css" href="../../themes/default/ui.all.css" rel="stylesheet" />
+	<script type="text/javascript" src="../../jquery-1.2.6.js"></script>
+	<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.droppable.js"></script>
+	<style type="text/css">
+	.ui-widget-header { width: 150px; height: 150px; padding: 0.5em; float: left; margin: 10px; }
+	.ui-widget-content { width: 100px; height: 100px; padding: 0.5em; float: left; margin: 10px; }
+	</style>
+	<script type="text/javascript">
+	$(function() {
+		
+		$("#draggable").draggable();
+		
+		$("#droppable").droppable({
+			activeClass: 'ui-state-hover',
+			hoverClass: 'ui-state-active',
+			drop: function(event, ui) {
+				$(this).addClass('ui-state-highlight').find('p').html('Dropped!');
+			}
+		});
+		
+		$("#droppable-fit").droppable({
+			activeClass: 'ui-state-hover',
+			hoverClass: 'ui-state-active',
+			tolerance: 'fit',
+			drop: function(event, ui) {
+				$(this).addClass('ui-state-highlight').find('p').html('Dropped!');
+			}
+		});
+		
+		$("#droppable-pointer").droppable({
+			activeClass: 'ui-state-hover',
+			hoverClass: 'ui-state-active',
+			tolerance: 'pointer',
+			drop: function(event, ui) {
+				$(this).addClass('ui-state-highlight').find('p').html('Dropped!');
+			}
+		});
+		
+		$("#droppable-touch").droppable({
+			activeClass: 'ui-state-hover',
+			hoverClass: 'ui-state-active',
+			tolerance: 'touch',
+			drop: function(event, ui) {
+				$(this).addClass('ui-state-highlight').find('p').html('Dropped!');
+			}
+		});
+		
+	});
+	</script>
+</head>
+<body>
+
+<div id="draggable" class="ui-widget-content">
+	<p>Drag me to my target</p>
+</div>
+
+<br clear="both" />
+
+<div id="droppable" class="ui-widget-header">
+	<p>Default tolerance</p>
+</div>
+
+<div id="droppable-fit" class="ui-widget-header">
+	<p>tolerance: 'fit'</p>
+</div>
+
+<div id="droppable-pointer" class="ui-widget-header">
+	<p>tolerance: 'pointer'</p>
+</div>
+
+<div id="droppable-touch" class="ui-widget-header">
+	<p>tolerance: 'touch'</p>
+</div>
+
+</body>
+</html>
