diff --git a/migration/i1.0c/oracle/201311131356_IDEMPIERE-1530.sql b/migration/i2.0/oracle/201311131356_IDEMPIERE-1530.sql
similarity index 100%
rename from migration/i1.0c/oracle/201311131356_IDEMPIERE-1530.sql
rename to migration/i2.0/oracle/201311131356_IDEMPIERE-1530.sql
diff --git a/migration/i1.0c/postgresql/201311131356_IDEMPIERE-1530.sql b/migration/i2.0/postgresql/201311131356_IDEMPIERE-1530.sql
similarity index 100%
rename from migration/i1.0c/postgresql/201311131356_IDEMPIERE-1530.sql
rename to migration/i2.0/postgresql/201311131356_IDEMPIERE-1530.sql
diff --git a/org.adempiere.pipo/src/org/adempiere/pipo2/PackInHandler.java b/org.adempiere.pipo/src/org/adempiere/pipo2/PackInHandler.java
index 0b2cfa5381..07cbe8593e 100644
--- a/org.adempiere.pipo/src/org/adempiere/pipo2/PackInHandler.java
+++ b/org.adempiere.pipo/src/org/adempiere/pipo2/PackInHandler.java
@@ -301,8 +301,12 @@ public class PackInHandler extends DefaultHandler {
     		{
     			if (e.contents.toString().length() != e.contents.toString().trim().length())
     			{
-    				String s = e.contents.toString().trim();
-    				e.contents = new StringBuffer(s);
+        			String trim = e.attributes.getValue("trim");
+        			if (!(trim != null && trim.equals("false")))
+        			{
+	    				String s = e.contents.toString().trim();
+	    				e.contents = new StringBuffer(s);
+        			}
     			}
     		}
     		if (stack.isEmpty())