diff --git a/library/HTMLPurifier/Strategy/MakeWellFormed.php b/library/HTMLPurifier/Strategy/MakeWellFormed.php
new file mode 100644
index 00000000..4104a617
--- /dev/null
+++ b/library/HTMLPurifier/Strategy/MakeWellFormed.php
@@ -0,0 +1,167 @@
+<?php
+
+require_once 'HTMLPurifier/Generator.php';
+require_once 'HTMLPurifier/Definition.php';
+
+class HTMLPurifier_Strategy_MakeWellFormed extends HTMLPurifier_Strategy
+{
+    
+    var $generator;
+    var $definition;
+    
+    function HTMLPurifier_Strategy_MakeWellFormed() {
+        $this->generator = new HTMLPurifier_Generator();
+        $this->definition = HTMLPurifier_Definition::instance();
+    }
+    
+    function execute($tokens) {
+        $result = array();
+        $current_nesting = array();
+        foreach ($tokens as $token) {
+            if (empty( $token->is_tag )) {
+                $result[] = $token;
+                continue;
+            }
+            $info = $this->definition->info[$token->name]; // assumption but valid
+            
+            // test if it claims to be a start tag but is empty
+            if ($info->child_def->type == 'empty' &&
+                $token->type == 'start' ) {
+                
+                $result[] = new HTMLPurifier_Token_Empty($token->name,
+                                                         $token->attributes);
+                continue;
+            }
+            
+            // test if it claims to be empty but really is a start tag
+            if ($info->child_def->type != 'empty' &&
+                $token->type == 'empty' ) {
+                
+                $result[] = new HTMLPurifier_Token_Start($token->name,
+                                                         $token->attributes);
+                $result[] = new HTMLPurifier_Token_End($token->name);
+                
+                continue;
+            }
+            
+            // automatically insert empty tags
+            if ($token->type == 'empty') {
+                $result[] = $token;
+                continue;
+            }
+            
+            // we give start tags precedence, so automatically accept unless...
+            // it's one of those special cases
+            if ($token->type == 'start') {
+                
+                // if there's a parent, check for special case
+                if (!empty($current_nesting)) {
+                    $current_parent = array_pop($current_nesting);
+                    
+                    // check if we're closing a P tag
+                    if ($current_parent->name == 'p' &&
+                        isset($this->definition->info_closes_p[$token->name])
+                        ) {
+                        $result[] = new HTMLPurifier_Token_End('p');
+                        $result[] = $token;
+                        $current_nesting[] = $token;
+                        continue;
+                    }
+                    
+                    // check if we're closing a LI tag
+                    if ($current_parent->name == 'li' &&
+                        $token->name == 'li'
+                        ) {
+                        $result[] = new HTMLPurifier_Token_End('li');
+                        $result[] = $token;
+                        $current_nesting[] = $token;
+                        continue;
+                    }
+                    
+                    // this is more TIDY stuff
+                    // we should also get some TABLE related code
+                    // mismatched h#
+                    
+                    $current_nesting[] = $current_parent; // undo the pop
+                }
+                
+                $result[] = $token;
+                $current_nesting[] = $token;
+                continue;
+            }
+            
+            // sanity check
+            if ($token->type != 'end') continue;
+            
+            // okay, we're dealing with a closing tag
+            
+            // make sure that we have something open
+            if (empty($current_nesting)) {
+                $result[] = new HTMLPurifier_Token_Text(
+                    $this->generator->generateFromToken($token)
+                );
+                continue;
+            }
+            
+            // first, check for the simplest case: everything closes neatly
+            
+            // current_nesting is modified
+            $current_parent = array_pop($current_nesting);
+            if ($current_parent->name == $token->name) {
+                $result[] = $token;
+                continue;
+            }
+            
+            // undo the array_pop
+            $current_nesting[] = $current_parent;
+            
+            // okay, so we're trying to close the wrong tag
+            
+            // scroll back the entire nest, trying to find our tag
+            // feature could be to specify how far you'd like to go
+            $size = count($current_nesting);
+            // -2 because -1 is the last element, but we already checked that
+            $skipped_tags = false;
+            for ($i = $size - 2; $i >= 0; $i--) {
+                if ($current_nesting[$i]->name == $token->name) {
+                    // current nesting is modified
+                    $skipped_tags = array_splice($current_nesting, $i);
+                    break;
+                }
+            }
+            
+            // we still didn't find the tag, so translate to text
+            if ($skipped_tags === false) {
+                $result[] = new HTMLPurifier_Token_Text(
+                    $this->generator->generateFromToken($token)
+                );
+                continue;
+            }
+            
+            // okay, we found it, close all the skipped tags
+            // note that skipped tags contains the element we need closed
+            $size = count($skipped_tags);
+            for ($i = $size - 1; $i >= 0; $i--) {
+                $result[] = new HTMLPurifier_Token_End($skipped_tags[$i]->name);
+            }
+            
+            // done!
+            
+        }
+        
+        // we're at the end now, fix all still unclosed tags
+        
+        if (!empty($current_nesting)) {
+            $size = count($current_nesting);
+            for ($i = $size - 1; $i >= 0; $i--) {
+                $result[] =
+                    new HTMLPurifier_Token_End($current_nesting[$i]->name);
+            }
+        }
+        
+        return $result;
+    }
+    
+}
+
+?>
\ No newline at end of file