diff --git a/util/statetrace/Makefile b/util/statetrace/SConstruct
similarity index 65%
rename from util/statetrace/Makefile
rename to util/statetrace/SConstruct
index 2c9c29a5f..de0eade6a 100644
--- a/util/statetrace/Makefile
+++ b/util/statetrace/SConstruct
@@ -1,4 +1,4 @@
-# Copyright (c) 2006-2007 The Regents of The University of Michigan
+# Copyright (c) 2011 Gabe Black
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -26,29 +26,7 @@
 #
 # Authors: Gabe Black
 
-CXX      ?= g++
-INCLUDES := -I ./ -I ./arch
-CXXFLAGS := -O3 -ggdb
-
-define build-obj
-$(CXX) -c $(patsubst %.o,%.cc,$@) -o $@ $(INCLUDES) $(CXXFLAGS)
-endef
-
-define final-link
-$(CXX) $(INCLUDES) $(CXXFLAGS) -o $@ $^
-endef
-
-all: statetrace
-
-statetrace.o: statetrace.cc tracechild.hh regstate.hh
-	$(build-obj)
-tracechild.o: tracechild.cc tracechild.hh regstate.hh
-	$(build-obj)
-tracechild_arch.o: statetrace.cc tracechild.hh regstate.hh arch/tracechild_arm.hh arch/tracechild_arm.cc arch/tracechild_i386.hh arch/tracechild_i386.cc arch/tracechild_amd64.cc arch/tracechild_amd64.hh arch/tracechild_sparc.cc arch/tracechild_sparc.hh
-	$(build-obj)
-
-statetrace: statetrace.o tracechild.o tracechild_arch.o
-	$(final-link)
-
-clean:
-	rm -f *.o statetrace
+sources = ['statetrace.cc', 'tracechild.cc', 'tracechild_arch.cc']
+cxx_flags = "-O3 -ggdb -I ./ -I ./arch"
+objects = [Object(source, CXXFLAGS=cxx_flags) for source in sources]
+Program('statetrace', objects)