Index: build_files/scons/tools/btools.py
===================================================================
--- build_files/scons/tools/btools.py	(revision 60675)
+++ build_files/scons/tools/btools.py	(working copy)
@@ -113,6 +113,7 @@
             'WITH_BF_REDCODE', 'BF_REDCODE', 'BF_REDCODE_INC', 'BF_REDCODE_LIB', 'BF_REDCODE_LIBPATH',
             'WITH_BF_PNG', 'BF_PNG', 'BF_PNG_INC', 'BF_PNG_LIB', 'BF_PNG_LIBPATH', 'WITH_BF_STATICPNG', 'BF_PNG_LIB_STATIC',
             'WITH_BF_TIFF', 'BF_TIFF', 'BF_TIFF_INC', 'BF_TIFF_LIB', 'BF_TIFF_LIBPATH', 'WITH_BF_STATICTIFF', 'BF_TIFF_LIB_STATIC',
+            'WITH_BF_PSD',
             'WITH_BF_ZLIB', 'BF_ZLIB', 'BF_ZLIB_INC', 'BF_ZLIB_LIB', 'BF_ZLIB_LIBPATH', 'WITH_BF_STATICZLIB', 'BF_ZLIB_LIB_STATIC',
             'WITH_BF_INTERNATIONAL',
             'WITH_BF_ICONV', 'BF_ICONV', 'BF_ICONV_INC', 'BF_ICONV_LIB', 'BF_ICONV_LIBPATH',
@@ -374,6 +375,8 @@
         ('BF_TIFF_LIBPATH', 'TIFF library path', ''),
         ('BF_TIFF_LIB_STATIC', 'TIFF static library', ''),
 
+        (BoolVariable('WITH_BF_PSD', 'Use PSD if true', False)),
+
         (BoolVariable('WITH_BF_ZLIB', 'Use ZLib if true', True)),
         (BoolVariable('WITH_BF_STATICZLIB', 'Staticly link to ZLib', False)),
         ('BF_ZLIB', 'ZLib base path', ''),
Index: source/blender/SConscript
===================================================================
--- source/blender/SConscript	(revision 60675)
+++ source/blender/SConscript	(working copy)
@@ -58,6 +58,9 @@
 if env['WITH_BF_OPENEXR']:
     SConscript (['imbuf/intern/openexr/SConscript'])
 
+if env['WITH_BF_PSD']:
+    SConscript (['imbuf/intern/oiio/SConscript'])
+
 if env['WITH_BF_QUICKTIME']:
     SConscript (['quicktime/SConscript'])
 
Index: source/blender/blenkernel/SConscript
===================================================================
--- source/blender/blenkernel/SConscript	(revision 60675)
+++ source/blender/blenkernel/SConscript	(working copy)
@@ -110,6 +110,9 @@
 if env['WITH_BF_OPENJPEG']:
     defs.append('WITH_OPENJPEG')
 
+if env['WITH_BF_PSD']:
+    defs.append('WITH_PSD')
+
 if env['WITH_BF_DDS']:
     defs.append('WITH_DDS')
 
Index: source/blender/imbuf/SConscript
===================================================================
--- source/blender/imbuf/SConscript	(revision 60675)
+++ source/blender/imbuf/SConscript	(working copy)
@@ -86,6 +86,9 @@
 else:
     sources.remove(os.path.join('intern', 'jp2.c'))
 
+if env['WITH_BF_PSD']:
+    defs.append('WITH_PSD')
+
 if env['WITH_BF_REDCODE']:
     defs.append('WITH_REDCODE')
     incs += ' ' + env['BF_REDCODE_INC']
Index: source/blender/makesrna/SConscript
===================================================================
--- source/blender/makesrna/SConscript	(revision 60675)
+++ source/blender/makesrna/SConscript	(working copy)
@@ -75,6 +75,9 @@
 if env['WITH_BF_OPENJPEG']:
     defs.append('WITH_OPENJPEG')
 
+if env['WITH_BF_PSD']:
+    defs.append('WITH_PSD')
+
 if env['WITH_BF_DDS']:
     defs.append('WITH_DDS')