diff -r d98f33d91553 -r e19a13ed19a9 java/sql-dk/src/info/globalcode/sql/dk/CLIParser.java
--- a/java/sql-dk/src/info/globalcode/sql/dk/CLIParser.java	Fri Dec 27 15:58:46 2013 +0100
+++ b/java/sql-dk/src/info/globalcode/sql/dk/CLIParser.java	Fri Dec 27 16:54:10 2013 +0100
@@ -139,22 +139,23 @@
 
 	public static class Tokens {
 
-		public static final String DB = "--db"; // bash-completion
-		public static final String SQL = "--sql"; // bash-completion
-		public static final String BATCH = "--batch"; // bash-completion
-		public static final String DATA = "--data"; // bash-completion
-		public static final String DATA_NAMED = "--data-named"; // bash-completion
-		public static final String NAME_PREFIX = "--name-prefix"; // bash-completion
-		public static final String NAME_SUFFIX = "--name-suffix"; // bash-completion
-		public static final String TYPES = "--types"; // bash-completion
-		public static final String FORMATTER = "--formatter"; // bash-completion
-		public static final String INFO_HELP = "--help"; // bash-completion
-		public static final String INFO_VERSION = "--version"; // bash-completion
-		public static final String INFO_LICENSE = "--license"; // bash-completion
-		public static final String INFO_FORMATTERS = "--list-formatters"; // bash-completion
-		public static final String INFO_TYPES = "--list-types"; // bash-completion
-		public static final String INFO_DATABASES = "--list-databases"; // bash-completion
-		public static final String INFO_CONNECTION = "--test-connection"; // bash-completion
+		// bash-completion:options:
+		public static final String DB = "--db"; // bash-completion:option
+		public static final String SQL = "--sql"; // bash-completion:option
+		public static final String BATCH = "--batch"; // bash-completion:option
+		public static final String DATA = "--data"; // bash-completion:option
+		public static final String DATA_NAMED = "--data-named"; // bash-completion:option
+		public static final String NAME_PREFIX = "--name-prefix"; // bash-completion:option
+		public static final String NAME_SUFFIX = "--name-suffix"; // bash-completion:option
+		public static final String TYPES = "--types"; // bash-completion:option
+		public static final String FORMATTER = "--formatter"; // bash-completion:option
+		public static final String INFO_HELP = "--help"; // bash-completion:option
+		public static final String INFO_VERSION = "--version"; // bash-completion:option
+		public static final String INFO_LICENSE = "--license"; // bash-completion:option
+		public static final String INFO_FORMATTERS = "--list-formatters"; // bash-completion:option
+		public static final String INFO_TYPES = "--list-types"; // bash-completion:option
+		public static final String INFO_DATABASES = "--list-databases"; // bash-completion:option
+		public static final String INFO_CONNECTION = "--test-connection"; // bash-completion:option
 
 		private Tokens() {
 		}