diff --git a/CHANGELOG b/CHANGELOG
index 2ce253568..b921def6b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+--------------------------------------------------------------------------------
+                     Changes in version 4.1.1
+--------------------------------------------------------------------------------
+- fixed update of folders (no more php error)
+
 --------------------------------------------------------------------------------
                      Changes in version 4.1.0
 --------------------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index cee6fb096..705cb7f0a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 VERSION=4.2.0
+=======
+VERSION=4.1.1
+>>>>>>> seeddms-4.1.1
 SRC=CHANGELOG inc conf utils index.php languages views op out README.md README.Notification README.Ubuntu drop-tables-innodb.sql styles js TODO LICENSE Makefile webdav install
 #restapi webapp
 
diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 618048c92..7f9f82d0d 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -225,7 +225,7 @@ class SeedDMS_Core_DMS {
 		$this->convertFileTypes = array();
 		$this->version = '@package_version@';
 		if($this->version[0] == '@')
-			$this->version = '4.1.0';
+			$this->version = '4.1.1';
 	} /* }}} */
 
 	function getDB() { /* {{{ */
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index d02223274..04a66b506 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -13,10 +13,10 @@
   <active>yes</active>
  </lead>
  <date>2013-04-05</date>
- <time>13:39:21</time>
+ <time>16:08:38</time>
  <version>
-  <release>4.2.0</release>
-  <api>4.2.0</api>
+  <release>4.1.1</release>
+  <api>4.1.1</api>
  </version>
  <stability>
   <release>beta</release>
@@ -24,7 +24,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-- minor bugfixes
+- stay in sync with seeddms application
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">