diff --git a/bin/nova-manage b/bin/nova-manage
index f418e162..cb987f33 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -218,7 +218,7 @@ def methods_of(obj):
 
 
 if __name__ == '__main__':
-    utils.default_flagfile()
+    utils.default_flagfile('/etc/nova-manage.conf')
     argv = FLAGS(sys.argv)
     script_name = argv.pop(0)
     if len(argv) < 1:
diff --git a/debian/changelog b/debian/changelog
index d90a15ac..6b250016 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ nova (0.3.0+really0.2.2-0ubuntu0ppa3) UNRELEASED; urgency=low
   * Add a dependency on nginx from nova-objectsstore and install a
     suitable configuration file.
   * Ship the CA directory in nova-common.
+  * Add a default flag file for nova-manage to help it find the CA.
 
  -- Soren Hansen <soren@ubuntu.com>  Tue, 06 Jul 2010 13:33:44 +0200
 
diff --git a/debian/nova-common.install b/debian/nova-common.install
index da0ac65a..f3d55404 100644
--- a/debian/nova-common.install
+++ b/debian/nova-common.install
@@ -1,4 +1,5 @@
 bin/nova-manage usr/bin
+debian/nova-manage.conf etc
 nova/auth/novarc.template             usr/share/nova
 nova/cloudpipe/client.ovpn.template   usr/share/nova
 nova/compute/libvirt.xml.template     usr/share/nova
diff --git a/debian/nova-manage.conf b/debian/nova-manage.conf
new file mode 100644
index 00000000..5ccda7ec
--- /dev/null
+++ b/debian/nova-manage.conf
@@ -0,0 +1,4 @@
+--ca_path=/var/lib/nova/CA
+--credentials_template=/usr/share/nova/novarc.template
+--keys_path=/var/lib/nova/keys
+--vpn_client_template=/usr/share/nova/client.ovpn.template