diff --git a/autowaf.py b/autowaf.py
index e68491cacf..ecd3d9adcc 100644
--- a/autowaf.py
+++ b/autowaf.py
@@ -138,6 +138,7 @@ def configure(conf):
 	check_tool(conf, 'compiler_cxx')
 	conf.env['BUILD_DOCS'] = Options.options.build_docs
 	conf.env['DEBUG'] = Options.options.debug
+	conf.env['STRICT'] = Options.options.strict
 	conf.env['PREFIX'] = os.path.abspath(os.path.expanduser(os.path.normpath(conf.env['PREFIX'])))
 	if Options.options.bundle:
 		conf.env['BUNDLE'] = True
@@ -268,6 +269,7 @@ def print_summary(conf):
 	display_header('Global configuration')
 	display_msg(conf, "Install prefix", conf.env['PREFIX'])
 	display_msg(conf, "Debuggable build", str(conf.env['DEBUG']))
+	display_msg(conf, "Strict compiler flags", str(conf.env['STRICT']))
 	display_msg(conf, "Build documentation", str(conf.env['BUILD_DOCS']))
 	print
 	g_step = 3
diff --git a/wscript b/wscript
index 0ac7049d41..ed24893dfd 100644
--- a/wscript
+++ b/wscript
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 import autowaf
+import Options
 import os
 import commands
 
@@ -74,9 +75,45 @@ def create_stored_revision():
 
 def set_options(opt):
 	autowaf.set_options(opt)
+	opt.add_option('--arch', type='string', dest='arch',
+			help='Architecture-specific compiler flags')
+	opt.add_option('--aubio', action='store_true', default=True, dest='aubio',
+			help="Use Paul Brossier's aubio library for feature detection (if available)")
+	opt.add_option('--audiounits', action='store_true', default=False, dest='audiounits',
+			help='Compile with Apple\'s AudioUnit library. (experimental)')
+	opt.add_option('--coreaudio', action='store_true', default=False, dest='coreaudio',
+			help='Compile with Apple\'s CoreAudio library')
+	opt.add_option('--fpu-optimization', action='store_true', default=True, dest='fpu_optimization',
+			help='Build runtime checked assembler code')
+	opt.add_option('--freedesktop', action='store_true', default=False, dest='freedesktop',
+			help='Install MIME type, icons and .desktop file as per freedesktop.org standards')
+	opt.add_option('--freesound', action='store_true', default=False, dest='freesound',
+			help='Include Freesound database lookup')
+	opt.add_option('--gtkosx', action='store_true', default=False, dest='gtkosx',
+			help='Compile for use with GTK-OSX, not GTK-X11')
+	opt.add_option('--lv2', action='store_true', default=False, dest='lv2',
+			help='Compile with support for LV2 (if slv2 is available)')
+	opt.add_option('--nls', action='store_true', default=True, dest='nls',
+			help='Set to turn on i18n support')
+	opt.add_option('--surfaces', action='store_true', default=True, dest='surfaces',
+			help='Build support for control surfaces')
+	opt.add_option('--syslibs', action='store_true', default=False, dest='syslibs',
+			help='Use existing system versions of various libraries instead of internal ones')
+	opt.add_option('--tranzport', action='store_true', default=True, dest='tranzport',
+			help='Compile with support for Frontier Designs (if libusb is available)')
+	opt.add_option('--universal', action='store_true', default=False, dest='universal',
+			help='Compile as universal binary.  Requires that external libraries are universal.')
+	opt.add_option('--versioned', action='store_true', default=False, dest='versioned',
+			help='Add revision information to executable name inside the build directory')
+	opt.add_option('--vst', action='store_true', default=False, dest='vst',
+			help='Compile with support for VST')
+	opt.add_option('--wiimote', action='store_true', default=False, dest='wiimote',
+			help='Build the wiimote control surface')
+	opt.add_option('--windows-key', type='string', dest='windows_key',
+			help='Set X Modifier (Mod1,Mod2,Mod3,Mod4,Mod5) for "Windows" key [Default: Mod4]')
 	for i in children:
 		opt.sub_options(i)
-
+	
 def sub_config_and_use(conf, name, has_objects = True):
 	conf.sub_config(name)
 	autowaf.set_local_lib(conf, name, has_objects)
@@ -89,6 +126,28 @@ def configure(conf):
 	autowaf.check_pkg(conf, 'glibmm-2.4', uselib_store='GLIBMM', atleast_version='2.14.0')
 	for i in children:
 		sub_config_and_use(conf, i)
+	
+	autowaf.print_summary(conf)
+	opts = Options.options
+	autowaf.display_header('Ardour Configuration')
+	autowaf.display_msg(conf, 'Architecture flags', opts.arch)
+	autowaf.display_msg(conf, 'Aubio', bool(conf.env['HAVE_AUBIO']))
+	autowaf.display_msg(conf, 'AudioUnits', opts.audiounits)
+	autowaf.display_msg(conf, 'CoreAudio', opts.coreaudio)
+	autowaf.display_msg(conf, 'FPU Optimization', opts.fpu_optimization)
+	autowaf.display_msg(conf, 'Freedesktop Files', opts.freedesktop)
+	autowaf.display_msg(conf, 'Freesound', opts.freesound)
+	autowaf.display_msg(conf, 'GtkOSX', opts.gtkosx)
+	autowaf.display_msg(conf, 'LV2 Support', bool(conf.env['HAVE_SLV2']))
+	autowaf.display_msg(conf, 'Translation', opts.nls)
+	autowaf.display_msg(conf, 'Surfaces', opts.surfaces)
+	autowaf.display_msg(conf, 'System Libraries', opts.syslibs)
+	autowaf.display_msg(conf, 'Tranzport', opts.tranzport)
+	autowaf.display_msg(conf, 'Universal Binary', opts.universal)
+	autowaf.display_msg(conf, 'Versioned Binary', opts.versioned)
+	autowaf.display_msg(conf, 'VST Support', opts.vst)
+	autowaf.display_msg(conf, 'Wiimote Support', opts.wiimote)
+	autowaf.display_msg(conf, 'Windows Key', opts.windows_key)
 
 def build(bld):
 	autowaf.set_recursive()