diff --git a/symmetric-db/src/main/java/org/jumpmind/db/io/DatabaseXmlUtil.java b/symmetric-db/src/main/java/org/jumpmind/db/io/DatabaseXmlUtil.java
index 95eb0e15f4..7a88c47daf 100644
--- a/symmetric-db/src/main/java/org/jumpmind/db/io/DatabaseXmlUtil.java
+++ b/symmetric-db/src/main/java/org/jumpmind/db/io/DatabaseXmlUtil.java
@@ -520,8 +520,10 @@ public static void write(Table table, Writer output) {
             for (ForeignKey fk : table.getForeignKeys()) {
                 output.write("\t\t<foreign-key name=\"" + StringEscapeUtils.escapeXml(fk.getName()) + "\" foreignTable=\""
                         + StringEscapeUtils.escapeXml(fk.getForeignTableName()) + "\" foreignTableCatalog=\""
-                        + StringEscapeUtils.escapeXml(fk.getForeignTableCatalog() == null ? "" : fk.getForeignTableCatalog()) + 
-                        "\" foreignTableSchema=\"" + StringEscapeUtils.escapeXml(fk.getForeignTableSchema() == null ? "" : fk.getForeignTableSchema())  + "\">\n");
+                        + StringEscapeUtils.escapeXml(fk.getForeignTableCatalog() == null || fk.getForeignTableCatalog().equals(table.getOldCatalog()) 
+                            ? "" : fk.getForeignTableCatalog()) + 
+                        "\" foreignTableSchema=\"" + StringEscapeUtils.escapeXml(fk.getForeignTableSchema() == null || 
+                            fk.getForeignTableSchema().equals(table.getOldSchema()) ? "" : fk.getForeignTableSchema())  + "\">\n");
                         		
                 for (Reference ref : fk.getReferences()) {
                     output.write("\t\t\t<reference local=\"" + StringEscapeUtils.escapeXml(ref.getLocalColumnName())