diff -urN webkit-r38860.orig/WebKit.pro webkit-r38860/WebKit.pro
--- webkit-r38860.orig/WebKit.pro	2009-01-13 14:50:32.000000000 +0000
+++ webkit-r38860/WebKit.pro	2009-01-13 14:50:39.000000000 +0000
@@ -8,5 +8,3 @@
         WebKit/qt/QtLauncher \
         WebKit/qt/tests
 
-!win32: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
-
diff -urN webkit-r38860.orig/WebKitTools/GNUmakefile.am webkit-r38860/WebKitTools/GNUmakefile.am
--- webkit-r38860.orig/WebKitTools/GNUmakefile.am	2009-01-13 14:50:32.000000000 +0000
+++ webkit-r38860/WebKitTools/GNUmakefile.am	2009-01-13 14:52:14.000000000 +0000
@@ -1,9 +1,5 @@
 noinst_PROGRAMS += \
-	Programs/GtkLauncher \
-	Programs/DumpRenderTree
-
-lib_LTLIBRARIES += \
-	TestNetscapePlugin/libtestnetscapeplugin.la
+	Programs/GtkLauncher
 
 # GtkLauncher
 Programs_GtkLauncher_CPPFLAGS = \
@@ -26,75 +22,6 @@
 	libwebkit-1.0.la \
 	$(GTK_LIBS)
 
-# DumpRenderTree
-Programs_DumpRenderTree_CPPFLAGS = \
-	-I$(srcdir)/WebKitTools/DumpRenderTree \
-	-I$(srcdir)/WebKitTools/DumpRenderTree/gtk \
-	-I$(srcdir)/WebKit/gtk \
-	-I$(top_builddir)/WebKit/gtk \
-	-DTEST_PLUGIN_DIR=\"${shell pwd}/${top_builddir}/TestNetscapePlugin/.libs\" \
-	$(global_cppflags) \
-	$(javascriptcore_cppflags)
-
-Programs_DumpRenderTree_SOURCES = \
-	WebKitTools/DumpRenderTree/AccessibilityController.h \
-	WebKitTools/DumpRenderTree/AccessibilityUIElement.h \
-	WebKitTools/DumpRenderTree/DumpRenderTree.h \
-	WebKitTools/DumpRenderTree/DumpRenderTreePrefix.h \
-	WebKitTools/DumpRenderTree/GCController.cpp \
-	WebKitTools/DumpRenderTree/GCController.h \
-	WebKitTools/DumpRenderTree/JavaScriptThreading.h \
-	WebKitTools/DumpRenderTree/LayoutTestController.cpp \
-	WebKitTools/DumpRenderTree/LayoutTestController.h \
-	WebKitTools/DumpRenderTree/PixelDumpSupport.h \
-	WebKitTools/DumpRenderTree/WorkQueue.cpp \
-	WebKitTools/DumpRenderTree/WorkQueue.h \
-	WebKitTools/DumpRenderTree/WorkQueueItem.h \
-	WebKitTools/DumpRenderTree/config.h \
-	WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp \
-	WebKitTools/DumpRenderTree/gtk/DumpRenderTreeGtk.h \
-	WebKitTools/DumpRenderTree/gtk/GCControllerGtk.cpp \
-	WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp \
-	WebKitTools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp
-
-Programs_DumpRenderTree_CXXFLAGS = \
-	$(global_cxxflags) \
-	$(Programs_DumpRenderTree_CFLAGS)
-
-Programs_DumpRenderTree_CFLAGS = \
-	-fno-strict-aliasing \
-	-O2 \
-	$(global_cflags) \
-	$(GLOBALDEPS_CFLAGS) \
-	$(CAIRO_CFLAGS) \
-	$(GTK_CFLAGS)
-
-Programs_DumpRenderTree_LDADD = \
-	libwebkit-1.0.la \
-	$(GLOBALDEPS_LIBS) \
-	$(CAIRO_LIBS) \
-	$(GTK_LIBS)
-
-# TestNetscapePlugin
-TestNetscapePlugin_libtestnetscapeplugin_la_CPPFLAGS = \
-	-I$(srcdir)/WebKitTools/DumpRenderTree \
-	-I$(srcdir)/WebKitTools/DumpRenderTree/gtk/TestNetscapePlugin/ForwardingHeaders \
-	-I$(srcdir)/WebCore \
-	-I$(srcdir)/WebCore/bridge \
-	-I$(srcdir)/WebCore/plugins \
-	-I$(srcdir)/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj \
-	$(global_cppflags) \
-	$(javascriptcore_cppflags)
-
-TestNetscapePlugin_libtestnetscapeplugin_la_SOURCES = \
-	WebKitTools/DumpRenderTree/gtk/TestNetscapePlugin/TestNetscapePlugin.cpp \
-	WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.cpp \
-	WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.h \
-	WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/TestObject.cpp \
-	WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/TestObject.h
-
 # clean target
 CLEANFILES += \
-	Programs/GtkLauncher \
-	Programs/DumpRenderTree \
-	TestNetscapePlugin/libtestnetscapeplugin.la
+	Programs/GtkLauncher
diff -urN webkit-r38860.orig/WebKitTools/Makefile webkit-r38860/WebKitTools/Makefile
--- webkit-r38860.orig/WebKitTools/Makefile	2009-01-13 14:50:32.000000000 +0000
+++ webkit-r38860/WebKitTools/Makefile	2009-01-13 14:50:39.000000000 +0000
@@ -1,4 +1,4 @@
-MODULES = DumpRenderTree
+MODULES =
 
 all:
 	@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
