diff --git a/Authors b/Authors
index 3448eb05..92aae922 100644
--- a/Authors
+++ b/Authors
@@ -51,6 +51,7 @@ David Subiros <david.perez5@hp.com>
 Dean Troyer <dtroyer@gmail.com>
 Deepak Garg <deepak.garg@citrix.com>
 Derek Higgins <derekh@redhat.com>
+Devananda van der Veen <devananda.vdv@gmail.com>
 Devdeep Singh <devdeep.singh@citrix.com>
 Devendra Modium <dmodium@isi.edu>
 Devin Carlen <devin.carlen@gmail.com>
diff --git a/nova/flags.py b/nova/flags.py
index 25d5e0be..9e446798 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -94,10 +94,6 @@ core_opts = [
                default='sqlite:///$state_path/$sqlite_db',
                help='The SQLAlchemy connection string used to connect to the '
                     'database'),
-    cfg.IntOpt('sql_connection_debug',
-               default=0,
-               help='Verbosity of SQL debugging information. 0=None, '
-                    '100=Everything'),
     cfg.StrOpt('api_paste_config',
                default="api-paste.ini",
                help='File name for the paste.deploy config for nova-api'),
@@ -120,6 +116,13 @@ debug_opts = [
     cfg.BoolOpt('fake_network',
                 default=False,
                 help='If passed, use fake network devices and addresses'),
+    cfg.IntOpt('sql_connection_debug',
+               default=0,
+               help='Verbosity of SQL debugging information. 0=None, '
+                    '100=Everything'),
+    cfg.BoolOpt('sql_connection_trace',
+               default=False,
+               help='Add python stack traces to SQL as comment strings'),
 ]
 
 FLAGS.register_cli_opts(log_opts)