diff --git a/ChangeLog b/ChangeLog
index ec97889ba..dc9ee6b89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-15  Raphael Ackermann <raphael.ackermann@gmail.com>
+    * data/man/nl/Makefile.am: added doc
+    * configure.in: added sv for swedish makefile
+
 2008-01-16  Douglas S. Blank  <dblank@cs.brynmawr.edu>
 	* src/Simple/_SimpleTable.py: added gettext
 	* data/Makefile.am: added schema files
@@ -45,8 +49,7 @@
     * man/sv/Makefile.am: Added Swedish man page (sv).
     * man/fr/gramps.1.in: got the French man page back, which I overwrote yesterday
 
->>>>>>> .r9846
-2008-01-15  Raphael Ackermann <raphael.ackermann@gmail.com>
+    2008-01-15  Raphael Ackermann <raphael.ackermann@gmail.com>
 	* src/docgen/Makefile.am: added line to copy gtkprintpreview.glade
 	on distcheck.
 
diff --git a/configure.in b/configure.in
index ded7d2938..d575e6819 100644
--- a/configure.in
+++ b/configure.in
@@ -190,6 +190,7 @@ data/Makefile
 data/man/Makefile
 data/man/fr/Makefile
 data/man/nl/Makefile
+data/man/sv/Makefile
 example/Makefile
 example/gramps/Makefile
 ])
diff --git a/data/man/nl/Makefile.am b/data/man/nl/Makefile.am
index b2ad2aec4..e373796a2 100644
--- a/data/man/nl/Makefile.am
+++ b/data/man/nl/Makefile.am
@@ -1,4 +1,4 @@
-# This is the data/man level Makefile for Gramps
+# This is the data/man/nl level Makefile for Gramps
 # $Id: Makefile.am 9819 2008-01-15 15:42:10Z bmcage $
 
 mandir = @mandir@/nl