Index: src/main/java/com/xpn/xwiki/doc/XWikiDocument.java
===================================================================
--- src/main/java/com/xpn/xwiki/doc/XWikiDocument.java	(revision 4194)
+++ src/main/java/com/xpn/xwiki/doc/XWikiDocument.java	(working copy)
@@ -301,7 +301,7 @@
     public Version getRCSVersion()
     {
         if (version == null) {
-            version = new Version("1.0");
+            return new Version("1.1");
         }
         return version;
     }
Index: src/main/java/com/xpn/xwiki/doc/XWikiDocumentArchive.java
===================================================================
--- src/main/java/com/xpn/xwiki/doc/XWikiDocumentArchive.java	(revision 4194)
+++ src/main/java/com/xpn/xwiki/doc/XWikiDocumentArchive.java	(working copy)
@@ -1,12 +1,19 @@
 package com.xpn.xwiki.doc;
 
+import com.xpn.xwiki.XWikiContext;
 import com.xpn.xwiki.XWikiException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.tools.ant.filters.StringInputStream;
 import org.suigeneris.jrcs.rcs.Archive;
+import org.suigeneris.jrcs.rcs.Node;
+import org.suigeneris.jrcs.rcs.Version;
 import org.suigeneris.jrcs.util.ToString;
 
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+
 public class XWikiDocumentArchive {
     private static final Log log = LogFactory.getLog(XWikiDocumentArchive.class);
 
@@ -71,7 +78,11 @@
     }
 
     public void updateArchive(String docname, String text) throws XWikiException {
+        updateArchive(docname, text, "1.0");
+    }
 
+    public void updateArchive(String docname, String text, String version) throws XWikiException {
+
         // JRCS used the user.name System property to set the author of a change. However JRCS
         // has a bug when the user name has a space in the name
         // (see http://www.suigeneris.org/issues/browse/JRCS-22). The workaround is to set the
@@ -90,7 +101,7 @@
             if (archive != null)
                 archive.addRevision(lines, "");
             else
-                archive = new Archive(lines, docname, "1.0");
+                archive = new Archive(lines, docname, version);
         }
         catch (Exception e) {
             Object[] args = { docname };
@@ -146,4 +157,83 @@
         return "id = [" + getId() + "], archive = ["
             + (getRCSArchive() == null ? "null" : getRCSArchive().toString()) + "]"; 
     }
+
+    public String getRevision(String version) throws XWikiException {
+        return getRevision(new Version(version));    
+    }
+
+    public String getRevision(Version version) throws XWikiException {
+        try {
+            Object[] text = archive.getRevision(version);
+            StringBuffer content = new StringBuffer();
+            for (int i=0;i<text.length;i++) {
+                String line = text[i].toString();
+                content.append(line);
+                content.append("\n");
+            }
+            return content.toString();
+        }
+        catch (Exception e) {
+            Object[] args = { "" + getId() };
+            throw new XWikiException(XWikiException.MODULE_XWIKI_STORE, XWikiException.ERROR_XWIKI_STORE_ARCHIVEFORMAT,
+                    "Exception while manipulating archive with id {0}", e, args);
+        }
+    }
+
+    public String getLastVersion() {
+        if (archive==null)
+            return "1.1";
+
+        Node[] nodes = archive.changeLog();
+        return nodes[nodes.length-1].getVersion().toString();
+    }
+
+
+    /**
+     * Fix for bug XWIKI-1468 allowing to correct the RCS files
+     * @param currentVersion
+     * @param context
+     * @throws XWikiException
+     * @deprecated
+     */
+    public void fixRCSArchive(XWikiContext context) throws XWikiException {
+        XWikiDocumentArchive newDocArchive = new XWikiDocumentArchive(this.getId());
+        String docname = getRCSArchive().getDesc();
+        Node[] nodes = archive.changeLog();
+        for (int i=0;i<nodes.length;i++) {
+            Node node = nodes[i];
+            String version = node.getVersion().toString();
+            //String newVersion = node.nextVersion().toString();
+            String xml = getRevision(version);
+            XWikiDocument doc = new XWikiDocument();
+            doc.fromXML(xml);
+            doc.setVersion(version);
+            newDocArchive.updateArchive(docname, doc.toXML(context), version);
+        }
+        Archive newArchive = newDocArchive.getRCSArchive();
+        Node[] newNodes = newArchive.changeLog();
+        for (int i=0;i<newNodes.length;i++) {
+            Date date = nodes[i].getDate();
+            GregorianCalendar cal = new GregorianCalendar();
+            cal.setTime(date);
+            int[] newDate = new int[6];
+            newDate[0] = cal.get(Calendar.YEAR);
+            newDate[1] = cal.get(Calendar.MONTH) + 1;
+            newDate[2] = cal.get(Calendar.DAY_OF_MONTH);
+            newDate[3] = cal.get(Calendar.HOUR_OF_DAY);
+            newDate[4] = cal.get(Calendar.MINUTE);
+            newDate[5] = cal.get(Calendar.SECOND);
+            newNodes[i].setDate(newDate);
+        }
+
+        setRCSArchive(newArchive);
+        if (context!=null) {
+            // force saving directly using hibernate
+            (context.getWiki().getVersioningStore()).saveXWikiDocArchive(this, true, context);
+        }
+    }
+
+    public Version getRevisionVersion(String version) {
+        return archive.getRevisionVersion(version);
+    }
 }