diff --git a/bin/autoupdater/autoUpdater.jar b/bin/autoupdater/autoUpdater.jar
index 85534f766fef..e7f3310ea296 100644
Binary files a/bin/autoupdater/autoUpdater.jar and b/bin/autoupdater/autoUpdater.jar differ
diff --git a/build.xml b/build.xml
index b505e84a4a29..f18113d71fbf 100644
--- a/build.xml
+++ b/build.xml
@@ -401,7 +401,7 @@
         <!--dotserver code (./dotserver)-->
         <copy todir="${distribution.dotserver.output}">
 			<fileset dir=".">
-				<exclude name="**/.svn" />
+				<exclude name="**/.git" />
 				<exclude name="tomcat/logs/**" />
 				<exclude name="dotCMS/WEB-INF/dotlucene/**" />
 				<exclude name="dotCMS/assets/**" />
@@ -440,7 +440,7 @@
 			<!--dotserver code (./dotserver)-->
 		 	<copy todir="${distribution.dotserver.output}">
 				<fileset dir=".">
-					<exclude name="**/.svn" />
+					<exclude name="**/.git" />
 					<exclude name="tomcat/logs/**" />
 					<exclude name="dotCMS/WEB-INF/dotlucene/**" />
 					<exclude name="dotCMS/assets/**" />
diff --git a/src/com/dotcms/autoupdater/UpdateUtil.java b/src/com/dotcms/autoupdater/UpdateUtil.java
index 57abf347055a..1d02aec13d29 100644
--- a/src/com/dotcms/autoupdater/UpdateUtil.java
+++ b/src/com/dotcms/autoupdater/UpdateUtil.java
@@ -107,6 +107,21 @@ public static boolean unzipDirectory ( File zipFile, String directoryName, Strin
                         dest.close();
                     }
 
+                }
+            } else {
+
+                //This code is to be certain that empty files are going to be create them as well....
+                if ( directoryName == null || entry.getName().contains( directoryName ) ) {
+
+                    String entryName = entry.getName().replace( UpdateAgent.FOLDER_HOME_DOTSERVER + '/', "" );
+                    File destFile = new File( home + File.separator + entryName );
+
+                    if (!destFile.exists()) {
+
+                        destFile.mkdirs();
+                        UpdateAgent.logger.debug( destFile.getAbsoluteFile() );
+                    }
+
                 }
             }
         }