diff -r 88de2602deb3 -r 2e351d7c26c4 java/sql-dk/src/info/globalcode/sql/dk/CLIParser.java
--- a/java/sql-dk/src/info/globalcode/sql/dk/CLIParser.java	Sun May 24 18:45:46 2015 +0200
+++ b/java/sql-dk/src/info/globalcode/sql/dk/CLIParser.java	Sun May 24 19:10:25 2015 +0200
@@ -129,6 +129,12 @@
 				case Tokens.INFO_LICENSE:
 					options.addShowInfo(InfoType.LICENSE);
 					break;
+				case Tokens.INFO_JAVA_PROPERTIES:
+					options.addShowInfo(InfoType.JAVA_PROPERTIES);
+					break;
+				case Tokens.INFO_ENVIRONMENT_VARIABLES:
+					options.addShowInfo(InfoType.ENVIRONMENT_VARIABLES);
+					break;
 				case Tokens.INFO_TYPES:
 					options.addShowInfo(InfoType.TYPES);
 					break;
@@ -182,6 +188,8 @@
 		public static final String INFO_HELP = "--help"; // bash-completion:option // help: print this help
 		public static final String INFO_VERSION = "--version"; // bash-completion:option // help: print version info
 		public static final String INFO_LICENSE = "--license"; // bash-completion:option // help: print license
+		public static final String INFO_JAVA_PROPERTIES = "--list-java-properties"; // bash-completion:option // help: list of Java system properties
+		public static final String INFO_ENVIRONMENT_VARIABLES = "--list-environment-variables"; // bash-completion:option // help: list of environment variables
 		public static final String INFO_FORMATTERS = "--list-formatters"; // bash-completion:option // help: print list of available formatters
 		public static final String INFO_TYPES = "--list-types"; // bash-completion:option // help: print list of available data types
 		public static final String INFO_JDBC_DRIVERS = "--list-jdbc-drivers"; // bash-completion:option // help: list of available JDBC drivers