diff --git a/ChangeLog b/ChangeLog
index 79f10114..a55db84f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,20 +1,23 @@
-2008-04-17:
-* Added "replaceTabsWithSpaces" option (manually at 
+2008-04-17:
+* Added: "replaceTabsWithSpaces" option (manually at 
   config file for now)
-
+* Added: restoring scrollbar and cursor position when 
+  restoring session
+* Fixed: bug with relative paths in filename (at statusbar)
+
 2008-04-16:
 * Fixed: if the app was closed maximized, it doesn't restore 
   normal size when started again;
-* Added French localization;
+* Added: French localization;
 
 2008-04-15:
 * Fixed: crash when tried to change 'Show line numbers' or 
   'Adjust by width' without any opened documents;
-* added options 'Show indents' and 'Highlight current line'
+* Added: options 'Show indents' and 'Highlight current line'
   to Settings dialog;
-* Added "useCurrentDocDir" option (manually at 
+* Added: "useCurrentDocDir" option (manually at 
   config file for now) for 'Open file' dialog;
-
+
 
 -------------------------------
 Version 0.3-dev
diff --git a/src/DocHandler.cpp b/src/DocHandler.cpp
index 5c034a48..a499323d 100644
--- a/src/DocHandler.cpp
+++ b/src/DocHandler.cpp
@@ -206,9 +206,10 @@ Document* DocHandler::newDocument(const QString& fileName) {
 	}
 
 	if (doc->isNull()) {
-
+		QString fName = QFileInfo(fileName).canonicalFilePath();
+		
 		DocView* docView = createDocView();
-		doc = createDocument(fileName, docView);
+		doc = createDocument(fName, docView);
 	
 		connect(docView, SIGNAL(modified(bool)), SLOT(docModified(bool)));
 		connect(doc, SIGNAL(fileNameChanged()), SLOT(docFileNameChanged()));
diff --git a/src/Document.cpp b/src/Document.cpp
index 2fc288e1..ec407ec1 100644
--- a/src/Document.cpp
+++ b/src/Document.cpp
@@ -63,7 +63,7 @@ void Document::extModMonitoringStop() {
 
 void Document::setFileName(const QString& fileName) {
 	if (fileName_.compare(fileName) != 0) {
-		fileName_ = fileName;
+		fileName_ = QFileInfo(fileName).canonicalFilePath();
 		emit fileNameChanged();
 	}
 }