diff --git a/jalopy/plugin.properties b/jalopy/plugin.properties
index 14049f92..1419f2f9 100644
--- a/jalopy/plugin.properties
+++ b/jalopy/plugin.properties
@@ -18,7 +18,7 @@
 # P L U G I N  P R O P E R I E S
 # -------------------------------------------------------------------
 
-maven.jalopy.fileFormat=unix
+maven.jalopy.fileFormat=auto
 maven.jalopy.style=${plugin.resources}/jalopy_maven.xml
 maven.jalopy.history=none
 maven.jalopy.logLevel=info
diff --git a/jalopy/src/plugin-resources/jalopy_maven.xml b/jalopy/src/plugin-resources/jalopy_maven.xml
index 6e0dee5d..abd8343e 100644
--- a/jalopy/src/plugin-resources/jalopy_maven.xml
+++ b/jalopy/src/plugin-resources/jalopy_maven.xml
@@ -83,7 +83,7 @@
         <whitespace>
             <paddingLogicalOperators>true</paddingLogicalOperators>
             <beforeMethodDeclarationParenthesis>false</beforeMethodDeclarationParenthesis>
-            <padddingBrackets>false</padddingBrackets>
+            <paddingBrackets>false</paddingBrackets>
             <afterComma>true</afterComma>
             <paddingBitwiseOperators>true</paddingBitwiseOperators>
             <paddingAssignmentOperators>true</paddingAssignmentOperators>
@@ -95,7 +95,7 @@
             <beforeBraces>true</beforeBraces>
             <beforeCaseColon>false</beforeCaseColon>
             <paddingMathematicalOperators>true</paddingMathematicalOperators>
-            <padddingBraces>true</padddingBraces>
+            <paddingBraces>true</paddingBraces>
             <beforeMethodCallParenthesis>false</beforeMethodCallParenthesis>
             <afterSemiColon>true</afterSemiColon>
             <beforeBracketsTypes>false</beforeBracketsTypes>
@@ -121,7 +121,7 @@
             </tabs>
             <caseFromSwitch>false</caseFromSwitch>
             <throws>-1</throws>
-            <braceLeft>0</braceLeft>
+            <braceLeft>1</braceLeft>
             <deep>30</deep>
             <braceRight>0</braceRight>
             <useMethodCallParams>false</useMethodCallParams>
@@ -203,7 +203,7 @@
             <removeBracesIfElse>false</removeBracesIfElse>
             <removeBracesWhile>false</removeBracesWhile>
             <rightBraceNewLine>true</rightBraceNewLine>
-            <leftBraceNewLine>true</leftBraceNewLine>
+            <leftBraceNewLine>false</leftBraceNewLine>
             <emptyCuddle>false</emptyCuddle>
             <insertBracesDoWhile>true</insertBracesDoWhile>
         </braces>
diff --git a/jalopy/xdocs/changes.xml b/jalopy/xdocs/changes.xml
index 76f481c8..83a0143d 100644
--- a/jalopy/xdocs/changes.xml
+++ b/jalopy/xdocs/changes.xml
@@ -25,6 +25,7 @@
   </properties>
   <body>
     <release version="1.4" date="In CVS">
+      <action dev="evenisse" type="update" issue="MPJALOPY-3">Matchs Jalopy and checkstyle.</action>
       <action dev="evenisse" type="update" issue="MPJALOPY-6">Allows multiple includes/excludes patterns.</action>
     </release>
     <release version="1.3" date="2004-07-08">
diff --git a/jalopy/xdocs/properties.xml b/jalopy/xdocs/properties.xml
index 3e06f9f9..8c207ef1 100644
--- a/jalopy/xdocs/properties.xml
+++ b/jalopy/xdocs/properties.xml
@@ -35,7 +35,7 @@
             Sets the file format of the output files. The file format
             controls what end of line character is used. Either one of
             "UNIX", "DOS", MAC", "DEFAULT" or "AUTO" can be used. Defaults
-            to "AUTO" (case insensitive). Defaults to "unix".
+            to "AUTO" (case insensitive).
           </td>
         </tr>
         <tr>