diff --git a/AUTHORS b/AUTHORS
index 77f802e12b..5fd81c08e3 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,2 +1,3 @@
 Andreas Schneider <asn@cryptomilk.org>
 Klaas Freitag <freitag@owncloud.com>
+Olivier Goffart <olivier>
diff --git a/doc/makeguide.sh b/doc/makeguide.sh
old mode 100755
new mode 100644
diff --git a/doc/makeman.sh b/doc/makeman.sh
old mode 100755
new mode 100644
diff --git a/modules/csync_owncloud.c b/modules/csync_owncloud.c
index a37c6e0ece..fabdfc3a71 100644
--- a/modules/csync_owncloud.c
+++ b/modules/csync_owncloud.c
@@ -1099,6 +1099,13 @@ static const char* owncloud_file_id( const char *path )
             cbuf = c_strdup(header);
         }
     }
+
+    /* fix server problem: If we end up with an empty string, set something strange... */
+    if( c_streq(cbuf, "") || c_streq(cbuf, "\"\"") ) {
+        SAFE_FREE(cbuf);
+        cbuf = c_strdup("empty_etag");
+    }
+
     DEBUG_WEBDAV("Get file ID for %s: %s", path, cbuf ? cbuf:"<null>");
     if( fs ) csync_vio_file_stat_destroy(fs);
     if( req ) ne_request_destroy(req);