diff --git a/changelog b/changelog
deleted file mode 100644
index dc013e9b8..000000000
--- a/changelog
+++ /dev/null
@@ -1,60 +0,0 @@
-pandoc (0.3) unstable; urgency=low
-
-  * New release with new build system and proper debian package
-
-  [ Recai Oktaş ]
-
-  * Revamped build process to conform to debian standards and created
-    a proper debian package.  Closes: #391666.
-
-  * Modified build process to support GHC 6.6.
-    + The package can still be compiled using GHC 6.4.2, though because
-      of dependencies the "make deb" target works only with GHC 6.6+.
-    + The script 'cabalize' is used to create an appropriate
-      'Pandoc.cabal' from 'Pandoc.cabal.in', depending on the GHC and
-      Cabal versions.
-
-  * Refactored template processing (fillTemplates.pl).
-	
-  * Modified wrapper scripts to make them more robust.
-
-  * Added '--output' option to markdown2pdf.
-
-  [ John MacFarlane ]
-
-  * Revised RTF writer:
-    + Default font is now Helvetica.
-    + An \f0 is added to each \pard, so that font resizing works correctly.
-
-  * Fixed handling of dashes in LaTeX writer:
-    + Recognize a double hyphen as an Em-dash, even when it occurs next
-      to punctuation (e.g. a quotation mark).
-    + Collapse space around Em-dashes.
-    + Process quotes before dashes.  This way (foo -- 'bar') will turn into
-      (foo---`bar') instead of (foo---'bar').
-
-  * Revised pandoc wrapper scripts to pipe output (as well as input)
-    through iconv.
-
-  * Added osx-pkg and osx-dmg targets to Makefile:
-    + osx-pkg creates a Mac OS X package (directory); osx-dmg creates a 
-      compressed disk image containing the package.
-    + New osx directory contains files needed for construction
-      of the package.
-
-  * Rewrote documentation and man pages.  Split README into INSTALL
-    and README.
-
- -- Recai Oktaş <roktas@debian.org>  Tue, 24 Oct 2006 07:48:30 +0300
-
-pandoc (0.2) unstable; urgency=low
-
-  * Fixed unicode/utf-8 translation
-
- -- John MacFarlane <jgm@berkeley.edu>  Mon,  14 Aug 2006 00:00:00 -0400
-
-pandoc (0.1) unstable; urgency=low
-
-  * Initial creation of debian package 
-
- -- John MacFarlane <jgm@berkeley.edu>  Mon,  14 Aug 2006 00:00:00 -0400
diff --git a/changelog b/changelog
new file mode 120000
index 000000000..d526672ce
--- /dev/null
+++ b/changelog
@@ -0,0 +1 @@
+debian/changelog
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
deleted file mode 120000
index 0891c85c5..000000000
--- a/debian/changelog
+++ /dev/null
@@ -1 +0,0 @@
-../changelog
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000000000..dc013e9b8
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,60 @@
+pandoc (0.3) unstable; urgency=low
+
+  * New release with new build system and proper debian package
+
+  [ Recai Oktaş ]
+
+  * Revamped build process to conform to debian standards and created
+    a proper debian package.  Closes: #391666.
+
+  * Modified build process to support GHC 6.6.
+    + The package can still be compiled using GHC 6.4.2, though because
+      of dependencies the "make deb" target works only with GHC 6.6+.
+    + The script 'cabalize' is used to create an appropriate
+      'Pandoc.cabal' from 'Pandoc.cabal.in', depending on the GHC and
+      Cabal versions.
+
+  * Refactored template processing (fillTemplates.pl).
+	
+  * Modified wrapper scripts to make them more robust.
+
+  * Added '--output' option to markdown2pdf.
+
+  [ John MacFarlane ]
+
+  * Revised RTF writer:
+    + Default font is now Helvetica.
+    + An \f0 is added to each \pard, so that font resizing works correctly.
+
+  * Fixed handling of dashes in LaTeX writer:
+    + Recognize a double hyphen as an Em-dash, even when it occurs next
+      to punctuation (e.g. a quotation mark).
+    + Collapse space around Em-dashes.
+    + Process quotes before dashes.  This way (foo -- 'bar') will turn into
+      (foo---`bar') instead of (foo---'bar').
+
+  * Revised pandoc wrapper scripts to pipe output (as well as input)
+    through iconv.
+
+  * Added osx-pkg and osx-dmg targets to Makefile:
+    + osx-pkg creates a Mac OS X package (directory); osx-dmg creates a 
+      compressed disk image containing the package.
+    + New osx directory contains files needed for construction
+      of the package.
+
+  * Rewrote documentation and man pages.  Split README into INSTALL
+    and README.
+
+ -- Recai Oktaş <roktas@debian.org>  Tue, 24 Oct 2006 07:48:30 +0300
+
+pandoc (0.2) unstable; urgency=low
+
+  * Fixed unicode/utf-8 translation
+
+ -- John MacFarlane <jgm@berkeley.edu>  Mon,  14 Aug 2006 00:00:00 -0400
+
+pandoc (0.1) unstable; urgency=low
+
+  * Initial creation of debian package 
+
+ -- John MacFarlane <jgm@berkeley.edu>  Mon,  14 Aug 2006 00:00:00 -0400
diff --git a/man/man1/html2markdown.1 b/man/man1/html2markdown.1
index 3ff142d3e..c1fe11474 100644
--- a/man/man1/html2markdown.1
+++ b/man/man1/html2markdown.1
@@ -17,7 +17,11 @@ or
 (or text from STDIN)
 from HTML to  markdown-formatted plain text.  It uses an available program
 (e.g. wget, w3m, lynx or curl) to fetch the contents of the URL.
+.SH "SEE ALSO"
+\fBpandoc\fR(1),
+\fBmarkdown2html\fR(1),
+\fBmarkdown2latex\fR(1),
+\fBlatex2markdown\fR(1),
+\fBmarkdown2pdf\fR(1)
 .SH AUTHOR
 John MacFarlane
-.SH "SEE ALSO"
-.BR pandoc (1), markdown2html (1), markdown2latex (1), latex2markdown (1), markdown2pdf (1)
diff --git a/man/man1/latex2markdown.1 b/man/man1/latex2markdown.1
index 9c77b03b1..b4acd363c 100644
--- a/man/man1/latex2markdown.1
+++ b/man/man1/latex2markdown.1
@@ -11,7 +11,11 @@ latex2markdown \- converts LaTeX to markdown-formatted text
 converts 
 .I input-file 
 (or text from STDIN) from LaTeX to markdown-formatted plain text.
+.SH "SEE ALSO"
+\fBpandoc\fR(1),
+\fBmarkdown2html\fR(1),
+\fBhtml2markdown\fR(1),
+\fBmarkdown2latex\fR(1),
+\fBmarkdown2pdf\fR(1)
 .SH AUTHOR
 John MacFarlane
-.SH "SEE ALSO"
-.BR pandoc (1), markdown2html (1), html2markdown (1), markdown2latex (1), markdown2pdf (1)
diff --git a/man/man1/markdown2html.1 b/man/man1/markdown2html.1
index 300aa1a40..63ad7a085 100644
--- a/man/man1/markdown2html.1
+++ b/man/man1/markdown2html.1
@@ -13,7 +13,11 @@ converts
 (or text from STDIN) from markdown-formatted plain text to HTML. 
 If multiple files are specified, they will be combined to make a single
 HTML document.
+.SH "SEE ALSO"
+\fBpandoc\fR(1),
+\fBhtml2markdown\fR(1),
+\fBmarkdown2latex\fR(1),
+\fBlatex2markdown\fR(1),
+\fBmarkdown2pdf\fR(1)
 .SH AUTHOR
 John MacFarlane
-.SH "SEE ALSO"
-.BR pandoc (1), html2markdown (1), markdown2latex (1), latex2markdown (1), markdown2pdf (1)
diff --git a/man/man1/markdown2latex.1 b/man/man1/markdown2latex.1
index ddbbb5456..5529f75ab 100644
--- a/man/man1/markdown2latex.1
+++ b/man/man1/markdown2latex.1
@@ -13,7 +13,11 @@ converts
 (or text from STDIN) from markdown-formatted
 plain text to LaTeX.  If multiple files are specified, they will
 be combined to make a single LaTeX document.
+.SH "SEE ALSO"
+\fBpandoc\fR(1),
+\fBmarkdown2html\fR(1),
+\fBhtml2markdown\fR(1),
+\fBlatex2markdown\fR(1),
+\fBmarkdown2pdf\fR(1)
 .SH AUTHOR
 John MacFarlane
-.SH "SEE ALSO"
-.BR pandoc (1), markdown2html (1), html2markdown (1), latex2markdown (1), markdown2pdf (1)
diff --git a/man/man1/markdown2pdf.1 b/man/man1/markdown2pdf.1
index e0e136bca..420c1bd86 100644
--- a/man/man1/markdown2pdf.1
+++ b/man/man1/markdown2pdf.1
@@ -24,7 +24,12 @@ the output file will be
 If the input is read from STDIN and no output filename is specified, 
 the output file will be named 
 .IR stdin.pdf .
+.SH "SEE ALSO"
+\fBpandoc\fR(1),
+\fBmarkdown2html\fR(1),
+\fBhtml2markdown\fR(1),
+\fBmarkdown2latex\fR(1),
+\fBlatex2markdown\fR(1),
+\fBpdflatex\fR(1)
 .SH AUTHOR
 John MacFarlane
-.SH "SEE ALSO"
-.BR pandoc (1), markdown2html (1), html2markdown (1), markdown2latex (1), latex2markdown (1), pdflatex (1)
diff --git a/man/man1/pandoc.1 b/man/man1/pandoc.1
index fdf79a8a7..6ca3bb9e4 100644
--- a/man/man1/pandoc.1
+++ b/man/man1/pandoc.1
@@ -159,11 +159,13 @@ Specify
 .I STRING
 as a prefix to the HTML window title.
 
-.SH AUTHOR
-John MacFarlane
-
 .SH "SEE ALSO"
-.BR markdown2html (1), html2markdown (1), markdown2latex (1), latex2markdown (1), markdown2pdf (1), iconv (1)
+\fBmarkdown2html\fR(1),
+\fBhtml2markdown\fR(1),
+\fBmarkdown2latex\fR(1),
+\fBlatex2markdown\fR(1),
+\fBmarkdown2pdf\fR(1),
+\fBiconv\fR(1)
 
 The
 .I README
@@ -171,3 +173,5 @@ file distributed with Pandoc contains full documentation.
 
 The Pandoc source code and all documentation may be downloaded from
 <http://sophos.berkeley.edu/macfarlane/pandoc/>.
+.SH AUTHOR
+John MacFarlane