diff --git a/waflib/Task.py b/waflib/Task.py
index 035fe77e..14f2a432 100644
--- a/waflib/Task.py
+++ b/waflib/Task.py
@@ -109,7 +109,7 @@ class store_task_type(type):
 		super(store_task_type, cls).__init__(name, bases, dict)
 		name = cls.__name__
 
-		if name != 'evil' and name != 'Task':
+		if name != 'Task':
 			if getattr(cls, 'run_str', None):
 				# if a string is provided, convert it to a method
 				(f, dvars) = compile_fun(cls.run_str, cls.shell)
diff --git a/waflib/fixpy2.py b/waflib/fixpy2.py
index 5be62e1d..cb330143 100644
--- a/waflib/fixpy2.py
+++ b/waflib/fixpy2.py
@@ -64,4 +64,4 @@ def r5(code):
 
 @subst('Task.py')
 def r6(code):
-	return code.replace('metaclass=store_task_type', "store_task_type('evil', (object,), {})")
+	return code.replace('class Task(metaclass=store_task_type):', "class Task(object):%s\t__metaclass__=store_task_type" % os.linesep)