diff --git a/editor.lib/src/org/netbeans/editor/ActionFactory.java b/editor.lib/src/org/netbeans/editor/ActionFactory.java
--- a/editor.lib/src/org/netbeans/editor/ActionFactory.java
+++ b/editor.lib/src/org/netbeans/editor/ActionFactory.java
@@ -93,7 +93,7 @@
 import org.netbeans.lib.editor.util.swing.PositionRegion;
 import org.netbeans.modules.editor.indent.api.Indent;
 import org.netbeans.modules.editor.indent.api.Reformat;
-import org.netbeans.modules.editor.lib.NavigationHistory;
+import org.netbeans.api.editor.NavigationHistory;
 import org.netbeans.modules.editor.lib2.RectangularSelectionUtils;
 import org.netbeans.modules.editor.lib2.view.DocumentView;
 import org.openide.util.ContextAwareAction;
diff --git a/editor.lib/src/org/netbeans/editor/BaseKit.java b/editor.lib/src/org/netbeans/editor/BaseKit.java
--- a/editor.lib/src/org/netbeans/editor/BaseKit.java
+++ b/editor.lib/src/org/netbeans/editor/BaseKit.java
@@ -102,7 +102,7 @@
 import org.netbeans.modules.editor.lib2.EditorPreferencesDefaults;
 import org.netbeans.modules.editor.lib2.EditorPreferencesKeys;
 import org.netbeans.modules.editor.lib.KitsTracker;
-import org.netbeans.modules.editor.lib.NavigationHistory;
+import org.netbeans.api.editor.NavigationHistory;
 import org.netbeans.modules.editor.lib.SettingsConversions;
 import org.netbeans.modules.editor.lib2.RectangularSelectionUtils;
 import org.netbeans.modules.editor.lib2.actions.KeyBindingsUpdater;
diff --git a/editor.lib/src/org/netbeans/editor/JumpList.java b/editor.lib/src/org/netbeans/editor/JumpList.java
--- a/editor.lib/src/org/netbeans/editor/JumpList.java
+++ b/editor.lib/src/org/netbeans/editor/JumpList.java
@@ -52,7 +52,7 @@
 import java.util.logging.Logger;
 import javax.swing.text.JTextComponent;
 import javax.swing.text.BadLocationException;
-import org.netbeans.modules.editor.lib.NavigationHistory;
+import org.netbeans.api.editor.NavigationHistory;
 import org.openide.modules.PatchedPublic;
 import org.openide.util.WeakListeners;
 
diff --git a/editor.lib/src/org/netbeans/editor/ext/ExtKit.java b/editor.lib/src/org/netbeans/editor/ext/ExtKit.java
--- a/editor.lib/src/org/netbeans/editor/ext/ExtKit.java
+++ b/editor.lib/src/org/netbeans/editor/ext/ExtKit.java
@@ -69,7 +69,7 @@
 import org.netbeans.editor.SyntaxSupport;
 import org.netbeans.lib.editor.util.CharSequenceUtilities;
 import org.netbeans.lib.editor.util.swing.DocumentUtilities;
-import org.netbeans.modules.editor.lib.NavigationHistory;
+import org.netbeans.api.editor.NavigationHistory;
 import org.netbeans.api.editor.EditorActionNames;
 import org.openide.util.Lookup;
 import org.openide.util.NbBundle;
diff --git a/editor.lib2/apichanges.xml b/editor.lib2/apichanges.xml
--- a/editor.lib2/apichanges.xml
+++ b/editor.lib2/apichanges.xml
@@ -107,8 +107,23 @@
     <!-- ACTUAL CHANGES BEGIN HERE: -->
 
     <changes>
+        <change id="NavigationHistory class added">
+            <summary></summary>
+            <version major="1" minor="74"/>
+            <date day="15" month="2" year="2013"/>
+            <author login="mkristofic"/>
+            <compatibility binary="compatible" source="compatible" semantic="compatible" addition="yes"/>
+            <description>
+                <p>
+                    Added NavigationHistory and NavigationHistory.Waypoint classes. It enables to add position to 
+                    edit history. It also enables get edit history and look on last edits.
+                </p>
+            </description>
+            <issue number="225808"/>
+        </change>
+
         <change id="TypedTextInterceptor.getReplacedText">
-            <summary>OnSaveTask interface added</summary>
+            <summary>method getReplacedText added</summary>
             <version major="1" minor="73"/>
             <date day="30" month="1" year="2013"/>
             <author login="mkristofic"/>
diff --git a/editor.lib2/nbproject/project.properties b/editor.lib2/nbproject/project.properties
--- a/editor.lib2/nbproject/project.properties
+++ b/editor.lib2/nbproject/project.properties
@@ -43,7 +43,7 @@
 is.autoload=true
 javac.source=1.6
 javac.compilerargs=-Xlint:unchecked
-spec.version.base=1.73.0
+spec.version.base=1.74.0
 
 javadoc.arch=${basedir}/arch.xml
 javadoc.apichanges=${basedir}/apichanges.xml
diff --git a/editor.lib/src/org/netbeans/modules/editor/lib/NavigationHistory.java b/editor.lib2/src/org/netbeans/api/editor/NavigationHistory.java
rename from editor.lib/src/org/netbeans/modules/editor/lib/NavigationHistory.java
rename to editor.lib2/src/org/netbeans/api/editor/NavigationHistory.java
--- a/editor.lib/src/org/netbeans/modules/editor/lib/NavigationHistory.java
+++ b/editor.lib2/src/org/netbeans/api/editor/NavigationHistory.java
@@ -42,7 +42,7 @@
  * made subject to such option by the copyright holder.
  */
 
-package org.netbeans.modules.editor.lib;
+package org.netbeans.api.editor;
 
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
@@ -60,6 +60,8 @@
 import javax.swing.text.BadLocationException;
 import javax.swing.text.JTextComponent;
 import javax.swing.text.Position;
+import org.netbeans.modules.editor.lib2.URLMapper;
+import org.netbeans.modules.editor.lib2.WeakPositions;
 
 /**
  *                       0    1    2    3    4    waypoints.size()
@@ -74,7 +76,7 @@
  * navigateBack() == W3, moves pointer one position left
  * navigateForward() == W4, moves pointer one position right
  * 
- * 
+ * @since 1.74
  * @author Vita Stejskal
  */
 public final class NavigationHistory {
@@ -290,10 +292,13 @@
         
         return waypoint;
     }
-    
+
+    /*
+     * @since 1.74
+     */
     public static final class Waypoint {
 
-        private NavigationHistory navigationHistory;
+        private final NavigationHistory navigationHistory;
         private Reference<JTextComponent> compRef;
         private Position pos;
         private URL url;
diff --git a/editor.lib/src/org/netbeans/modules/editor/lib/URLMapper.java b/editor.lib2/src/org/netbeans/modules/editor/lib2/URLMapper.java
rename from editor.lib/src/org/netbeans/modules/editor/lib/URLMapper.java
rename to editor.lib2/src/org/netbeans/modules/editor/lib2/URLMapper.java
--- a/editor.lib/src/org/netbeans/modules/editor/lib/URLMapper.java
+++ b/editor.lib2/src/org/netbeans/modules/editor/lib2/URLMapper.java
@@ -42,7 +42,7 @@
  * made subject to such option by the copyright holder.
  */
 
-package org.netbeans.modules.editor.lib;
+package org.netbeans.modules.editor.lib2;
 
 import java.net.URL;
 import java.util.Collection;
diff --git a/editor.lib/src/org/netbeans/modules/editor/lib/WeakPositions.java b/editor.lib2/src/org/netbeans/modules/editor/lib2/WeakPositions.java
rename from editor.lib/src/org/netbeans/modules/editor/lib/WeakPositions.java
rename to editor.lib2/src/org/netbeans/modules/editor/lib2/WeakPositions.java
--- a/editor.lib/src/org/netbeans/modules/editor/lib/WeakPositions.java
+++ b/editor.lib2/src/org/netbeans/modules/editor/lib2/WeakPositions.java
@@ -42,7 +42,7 @@
  * made subject to such option by the copyright holder.
  */
 
-package org.netbeans.modules.editor.lib;
+package org.netbeans.modules.editor.lib2;
 
 import java.util.Map;
 import java.util.WeakHashMap;
@@ -106,6 +106,7 @@
 
     private static final DocumentListener documentsTracker = new DocumentListener() {
 
+        @Override
         public void insertUpdate(DocumentEvent e) {
             synchronized (OGLS) {
                 OffsetGapList<WeakPositions.WeakP> ogl = getOgl(e);
@@ -115,6 +116,7 @@
             }
         }
 
+        @Override
         public void removeUpdate(DocumentEvent e) {
             synchronized (OGLS) {
                 OffsetGapList<WeakPositions.WeakP> ogl = getOgl(e);
@@ -124,6 +126,7 @@
             }
         }
 
+        @Override
         public void changedUpdate(DocumentEvent e) {
             // attribute's changed, ignore
         }
diff --git a/editor.search/src/org/netbeans/modules/editor/search/EditorFindSupport.java b/editor.search/src/org/netbeans/modules/editor/search/EditorFindSupport.java
--- a/editor.search/src/org/netbeans/modules/editor/search/EditorFindSupport.java
+++ b/editor.search/src/org/netbeans/modules/editor/search/EditorFindSupport.java
@@ -69,7 +69,7 @@
 import org.netbeans.api.editor.mimelookup.MimePath;
 import org.netbeans.api.editor.settings.FontColorNames;
 import org.netbeans.api.editor.settings.SimpleValueNames;
-import org.netbeans.modules.editor.lib.NavigationHistory;
+import org.netbeans.api.editor.NavigationHistory;
 import org.netbeans.modules.editor.lib2.ComponentUtils;
 import org.netbeans.modules.editor.lib2.DocUtils;
 import org.netbeans.modules.editor.lib2.highlighting.BlockHighlighting;
diff --git a/editor/src/org/netbeans/modules/editor/impl/NbURLMapper.java b/editor/src/org/netbeans/modules/editor/impl/NbURLMapper.java
--- a/editor/src/org/netbeans/modules/editor/impl/NbURLMapper.java
+++ b/editor/src/org/netbeans/modules/editor/impl/NbURLMapper.java
@@ -50,7 +50,7 @@
 import java.util.logging.Logger;
 import javax.swing.JEditorPane;
 import javax.swing.text.JTextComponent;
-import org.netbeans.modules.editor.lib.URLMapper;
+import org.netbeans.modules.editor.lib2.URLMapper;
 import org.openide.cookies.EditorCookie;
 import org.openide.filesystems.FileObject;
 import org.openide.filesystems.FileStateInvalidException;
@@ -62,7 +62,7 @@
  *
  * @author Vita Stejskal
  */
-@org.openide.util.lookup.ServiceProvider(service=org.netbeans.modules.editor.lib.URLMapper.class)
+@org.openide.util.lookup.ServiceProvider(service=org.netbeans.modules.editor.lib2.URLMapper.class)
 public final class NbURLMapper extends URLMapper {
 
     private static final Logger LOG = Logger.getLogger(NbURLMapper.class.getName());
diff --git a/editor/src/org/netbeans/modules/editor/impl/actions/NavigationHistoryBackAction.java b/editor/src/org/netbeans/modules/editor/impl/actions/NavigationHistoryBackAction.java
--- a/editor/src/org/netbeans/modules/editor/impl/actions/NavigationHistoryBackAction.java
+++ b/editor/src/org/netbeans/modules/editor/impl/actions/NavigationHistoryBackAction.java
@@ -65,7 +65,7 @@
 import javax.swing.text.TextAction;
 import org.netbeans.editor.BaseDocument;
 import org.netbeans.editor.BaseKit;
-import org.netbeans.modules.editor.lib.NavigationHistory;
+import org.netbeans.api.editor.NavigationHistory;
 import org.openide.awt.DropDownButtonFactory;
 import org.openide.cookies.EditorCookie;
 import org.openide.cookies.LineCookie;
diff --git a/editor/src/org/netbeans/modules/editor/impl/actions/NavigationHistoryForwardAction.java b/editor/src/org/netbeans/modules/editor/impl/actions/NavigationHistoryForwardAction.java
--- a/editor/src/org/netbeans/modules/editor/impl/actions/NavigationHistoryForwardAction.java
+++ b/editor/src/org/netbeans/modules/editor/impl/actions/NavigationHistoryForwardAction.java
@@ -57,7 +57,7 @@
 import javax.swing.text.JTextComponent;
 import javax.swing.text.TextAction;
 import org.netbeans.editor.BaseKit;
-import org.netbeans.modules.editor.lib.NavigationHistory;
+import org.netbeans.api.editor.NavigationHistory;
 import org.openide.awt.DropDownButtonFactory;
 import org.openide.util.ContextAwareAction;
 import org.openide.util.ImageUtilities;
diff --git a/editor/src/org/netbeans/modules/editor/impl/actions/NavigationHistoryLastEditAction.java b/editor/src/org/netbeans/modules/editor/impl/actions/NavigationHistoryLastEditAction.java
--- a/editor/src/org/netbeans/modules/editor/impl/actions/NavigationHistoryLastEditAction.java
+++ b/editor/src/org/netbeans/modules/editor/impl/actions/NavigationHistoryLastEditAction.java
@@ -52,7 +52,7 @@
 import org.netbeans.api.editor.EditorActionRegistration;
 import org.netbeans.editor.BaseAction;
 import org.netbeans.modules.editor.MainMenuAction;
-import org.netbeans.modules.editor.lib.NavigationHistory;
+import org.netbeans.api.editor.NavigationHistory;
 import org.openide.util.NbBundle;
 import org.openide.util.WeakListeners;