diff --git a/src/arch/mips/SConscript b/src/arch/mips/SConscript
index 8be445c..844e7ba 100644
--- a/src/arch/mips/SConscript
+++ b/src/arch/mips/SConscript
@@ -33,6 +33,9 @@
 Import('*')
 
 if env['TARGET_ISA'] == 'mips':
+# Workaround for bug in SCons version > 0.97d20071212
+# Scons bug id: 2006 M5 Bug id: 308 
+    Dir('isa/formats')
     Source('faults.cc')
     Source('regfile/int_regfile.cc')
     Source('regfile/float_regfile.cc')
diff --git a/src/arch/sparc/SConscript b/src/arch/sparc/SConscript
index a86c002..d4d68a6 100644
--- a/src/arch/sparc/SConscript
+++ b/src/arch/sparc/SConscript
@@ -32,6 +32,10 @@
 Import('*')
 
 if env['TARGET_ISA'] == 'sparc':
+# Workaround for bug in SCons version > 0.97d20071212
+# Scons bug id: 2006 M5 Bug id: 308 
+    Dir('isa/formats')
+    Dir('isa/formats/mem')
     Source('asi.cc')
     Source('faults.cc')
     Source('floatregfile.cc')
diff --git a/src/kern/SConscript b/src/kern/SConscript
index fd11817..43848aa 100644
--- a/src/kern/SConscript
+++ b/src/kern/SConscript
@@ -54,3 +54,5 @@
     Dir('linux')
     if env['TARGET_ISA'] == 'alpha':
         Dir('tru64')
+    elif env['TARGET_ISA'] == 'sparc':
+        Dir('solaris')