diff --git a/packages/base/all/vendor-config-onl/src/bin/onl-sysconfig b/packages/base/all/vendor-config-onl/src/bin/onl-sysconfig
new file mode 100755
index 00000000..3b651d5a
--- /dev/null
+++ b/packages/base/all/vendor-config-onl/src/bin/onl-sysconfig
@@ -0,0 +1,14 @@
+#!/usr/bin/python
+import os
+import sys
+from onl.sysconfig import sysconfig
+import yaml
+
+if len(sys.argv) == 2:
+    try:
+        print yaml.dump((eval("sysconfig.%s" % sys.argv[1])), default_flow_style=False)
+    except AttributeError, e:
+        print "Path %s is not in the config." % sys.argv[1]
+else:
+    print sysconfig['OnlSystemConfig'].dump()
+
diff --git a/packages/base/all/vendor-config-onl/src/etc/onl/config/onl-config.yml b/packages/base/all/vendor-config-onl/src/etc/onl/config/00-defaults.yml
similarity index 85%
rename from packages/base/all/vendor-config-onl/src/etc/onl/config/onl-config.yml
rename to packages/base/all/vendor-config-onl/src/etc/onl/config/00-defaults.yml
index ea59fc6d..8a42968f 100644
--- a/packages/base/all/vendor-config-onl/src/etc/onl/config/onl-config.yml
+++ b/packages/base/all/vendor-config-onl/src/etc/onl/config/00-defaults.yml
@@ -1,9 +1,10 @@
 ############################################################
 #
-# ONL System Configuration
+# ONL Default System Configuration.
+#
+# These provide the base default values for all sysconfig keys.
 #
 ############################################################
-
 upgrade:
   onie:
     auto-upgrade: advisory
@@ -16,7 +17,6 @@ upgrade:
         - $PLATFORM.itb
         - onl-loader-fit.itb
 
-
 pki:
   key:
     name: key.pem
@@ -32,4 +32,8 @@ pki:
         commonName: Networking
         organizationalUnitName: Open Network Linux
         emailAddress: support@bigswitch.com
-      cdays: 3600
\ No newline at end of file
+      cdays: 3600
+
+
+
+