diff --git a/Contrib/ExDLL/SConscript b/Contrib/ExDLL/SConscript
index 80b9f5fa..0c36f3a3 100644
--- a/Contrib/ExDLL/SConscript
+++ b/Contrib/ExDLL/SConscript
@@ -8,7 +8,6 @@ lib_files = Split("""
 
 api_files = Split("""
 	pluginapi.h
-	pluginapi.lib
 	#Source/exehead/api.h
 """)
 
@@ -32,11 +31,25 @@ lib = api_env.Library(lib_target, lib_files)
 
 # distribute library, files and examples
 
-env.DistributeExamples(example + api_files + lib, path='Plugin')
+example += api_files
+
+if env['PLATFORM'] == 'win32':
+	example += lib
+
+else:
+	example += lib_files
+
+	if env.has_key('PREFIX_PLUGINAPI_INC'):
+		env.Distribute(api_files, None, 'pluginapi_inc', '', '', 'pluginapi', 'pluginapi')
+
+	if env.has_key('PREFIX_PLUGINAPI_LIB'):
+		env.Distribute(lib, None, 'pluginapi_lib', '', '', 'pluginapi', 'pluginapi')
+
+env.DistributeExamples(example, path='Plugin')
 
 # make sure all the other plug-ins can use the library
 
-env.Install('#$BUILD_PREFIX/api', api_files)
+env.Install('#$BUILD_PREFIX/api', api_files + lib)
 
 plugin_env.Append(CPPPATH = ['#$BUILD_PREFIX/api'])
 plugin_env.Append(LIBPATH = ['#$BUILD_PREFIX/api'])
diff --git a/SCons/Tools/crossmingw.py b/SCons/Tools/crossmingw.py
index 0fa1e217..d27e01c7 100644
--- a/SCons/Tools/crossmingw.py
+++ b/SCons/Tools/crossmingw.py
@@ -172,8 +172,6 @@ def generate(env):
     env['SHOBJSUFFIX']    = '$OBJSUFFIX'
     env['PROGPREFIX']     = ''
     env['PROGSUFFIX']     = '.exe'
-    env['LIBPREFIX']      = ''
-    env['LIBSUFFIX']      = '.lib'
     env['SHLIBPREFIX']    = ''
     env['SHLIBSUFFIX']    = '.dll'
     env['LIBPREFIXES']    = [ '$LIBPREFIX' ]
diff --git a/SConstruct b/SConstruct
index ffdb5d2a..9eacb09e 100644
--- a/SConstruct
+++ b/SConstruct
@@ -167,6 +167,8 @@ opts.Add(('PREFIX_CONF', 'Path to install nsisconf.nsh to', dirs['conf']))
 opts.Add(('PREFIX_BIN', 'Path to install native binaries to', dirs['bin']))
 opts.Add(('PREFIX_DATA', 'Path to install nsis data to (plugins, includes, stubs, contrib, win32 binaries)', dirs['data']))
 opts.Add(('PREFIX_DOC','Path to install nsis README / INSTALL / TODO files to.', dirs['doc']))
+opts.Add(('PREFIX_PLUGINAPI_INC','Path to install plugin API headers to.', None))
+opts.Add(('PREFIX_PLUGINAPI_LIB','Path to install plugin static library to.', None))
 
 opts.Update(defenv)
 Help(opts.GenerateHelpText(defenv))