diff --git a/liquibase-core/src/main/java/liquibase/integration/ant/BaseLiquibaseTask.java b/liquibase-core/src/main/java/liquibase/integration/ant/BaseLiquibaseTask.java
index 332a446c3a..fbfc96b32c 100644
--- a/liquibase-core/src/main/java/liquibase/integration/ant/BaseLiquibaseTask.java
+++ b/liquibase-core/src/main/java/liquibase/integration/ant/BaseLiquibaseTask.java
@@ -52,6 +52,8 @@ public abstract class BaseLiquibaseTask extends Task {
     private String databaseChangeLogTableName;
     private String databaseChangeLogLockTableName;
     private String databaseChangeLogObjectsTablespace;
+    private boolean outputDefaultSchema = true; // Default based on setting in AbstractJdbcDatabase
+    private boolean outputDefaultCatalog = true;
 
 
     private Map<String, Object> changeLogProperties = new HashMap<String, Object>();
@@ -265,6 +267,8 @@ public URLClassLoader run() {
         database = DatabaseFactory.getInstance().findCorrectDatabaseImplementation(new JdbcConnection(connection));
         database.setDefaultCatalogName(defaultCatalogName);
         database.setDefaultSchemaName(defaultSchemaName);
+        database.setOutputDefaultSchema(isOutputDefaultSchema());
+        database.setOutputDefaultCatalog(isOutputDefaultCatalog());
 
         if (getDatabaseChangeLogTableName() != null)
             database.setDatabaseChangeLogTableName(getDatabaseChangeLogTableName());
@@ -401,6 +405,32 @@ public void setDatabaseChangeLogObjectsTablespace(String tablespaceName) {
         this.databaseChangeLogObjectsTablespace = tablespaceName;
     }
 
+    public boolean isOutputDefaultSchema() {
+        return outputDefaultSchema;
+    }
+
+    /**
+     * If not set, defaults to true.
+     *
+     * @param outputDefaultSchema True to output the default schema.
+     */
+    public void setOutputDefaultSchema(boolean outputDefaultSchema) {
+        this.outputDefaultSchema = outputDefaultSchema;
+    }
+
+    public boolean isOutputDefaultCatalog() {
+        return outputDefaultCatalog;
+    }
+
+    /**
+     * If not set, defaults to true
+     *
+     * @param outputDefaultCatalog True to output the default catalog.
+     */
+    public void setOutputDefaultCatalog(boolean outputDefaultCatalog) {
+        this.outputDefaultCatalog = outputDefaultCatalog;
+    }
+
     public String getLogLevel() {
         return LogFactory.getLogger().getLogLevel().name();
     }