diff --git a/CREDITS b/CREDITS
index 2014bc5..a806a53 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2,7 +2,7 @@ Discount is primarily my work, but it has only reached the point
 where it is via contributions, critiques, and bug reports from a
 host of other people, some of which are listed before.   If your
 name isn't on this list, please remind me
-				    -david parsons (orc@pell.chi.il.us)
+				    -david parsons (orc@pell.portland.or.us)
 
 
 Josh Wood	--  Plan9 support.
diff --git a/Makefile.in b/Makefile.in
index 0694263..3bda63d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -31,11 +31,9 @@ install: $(PGMS) $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(INCDIR)
 install.everything: install install.samples install.man
 
 install.samples: $(SAMPLE_PGMS) install $(DESTDIR)$(BINDIR)
+	@INSTALL_PROGRAM@ $(SAMPLE_PGMS) $(DESTDIR)$(BINDIR)
 	@INSTALL_DIR@ $(DESTDIR)$(MANDIR)/man1
-	for x in $(SAMPLE_PGMS); do \
-	    @INSTALL_PROGRAM@ $$x $(DESTDIR)$(BINDIR)/$(SAMPLE_PFX)$$x; \
-	    @INSTALL_DATA@ $$x.1 $(DESTDIR)$(MANDIR)/man1/$(SAMPLE_PFX)$$x; \
-	done
+	@INSTALL_DATA@ theme.1 makepage.1 mkd2html.1 $(DESTDIR)$(MANDIR)/man1
 
 install.man:
 	@INSTALL_DIR@ $(DESTDIR)$(MANDIR)/man3
diff --git a/README b/README
index 84d38e9..3d33a8b 100644
--- a/README
+++ b/README
@@ -5,7 +5,7 @@ language as described in
 and passes the Markdown test suite at
 <http://daringfireball.net/projects/downloads/MarkdownTest_1.0.zip>
 
-DISCOUNT is free software written by David Parsons <orc@pell.chi.il.us>;
+DISCOUNT is free software written by David Parsons <orc@pell.portland.or.us>;
 it is released under a BSD-style license that allows you to do
 as you wish with it as long as you don't attempt to claim it as
 your own work.
diff --git a/configure.sh b/configure.sh
index 166665a..44c8986 100755
--- a/configure.sh
+++ b/configure.sh
@@ -13,7 +13,6 @@ ac_help='--enable-amalloc	Enable memory allocation debugging
 --with-id-anchor	Use id= anchors for table-of-contents links
 --with-github-tags	Allow `_` and `-` in <> tags
 --with-fenced-code	Allow fenced code blocks
---with-urlencoded-anchor	Use url-encoded chars to multibyte chars in toc links
 --enable-all-features	Turn on all stable optional features
 --shared		Build shared libraries (default is static)'
 
@@ -58,7 +57,6 @@ esac
 test "$WITH_FENCED_CODE" && AC_DEFINE "WITH_FENCED_CODE" 1
 test "$WITH_ID_ANCHOR" && AC_DEFINE 'WITH_ID_ANCHOR' 1
 test "$WITH_GITHUB_TAGS" && AC_DEFINE 'WITH_GITHUB_TAGS' 1
-test "$WITH_URLENCODED_ANCHOR" && AC_DEFINE 'WITH_URLENCODED_ANCHOR' 1
 
 AC_PROG_CC
 
diff --git a/makepage.1 b/makepage.1
index 76b38dc..6283b2b 100644
--- a/makepage.1
+++ b/makepage.1
@@ -42,4 +42,4 @@ utility exits 0 on success, and >0 if an error occurs.
 .Xr mkd-extensions 7 .
 .Sh AUTHOR
 .An David Parsons
-.Pq Li orc@pell.chi.il.us
+.Pq Li orc@pell.portland.or.us
diff --git a/markdown.1 b/markdown.1
index 4bd69e1..60ad8c6 100644
--- a/markdown.1
+++ b/markdown.1
@@ -176,4 +176,4 @@ utility exits 0 on success, and >0 if an error occurs.
 .Xr mkd-extensions 7 .
 .Sh AUTHOR
 .An David Parsons
-.Pq Li orc@pell.chi.il.us
+.Pq Li orc@pell.portland.or.us
diff --git a/mkd2html.1 b/mkd2html.1
index 44688d9..3094b20 100644
--- a/mkd2html.1
+++ b/mkd2html.1
@@ -49,4 +49,4 @@ utility exits 0 on success, and >0 if an error occurs.
 .Xr mkd-extensions 7 .
 .Sh AUTHOR
 .An David Parsons
-.Pq Li orc@pell.chi.il.us
+.Pq Li orc@pell.portland.or.us
diff --git a/mkd2html.c b/mkd2html.c
index a0b8c1a..819d528 100644
--- a/mkd2html.c
+++ b/mkd2html.c
@@ -159,7 +159,7 @@ char **argv;
 	"  <meta name=\"GENERATOR\" content=\"mkd2html %s\">\n", markdown_version);
 
     fprintf(output,"  <meta http-equiv=\"Content-Type\"\n"
-		   "        content=\"text/html; charset=utf-8\">");
+		   "        content=\"text/html; charset-utf-8\">");
 
     for ( i=0; i < S(css); i++ )
 	fprintf(output, "  <link rel=\"stylesheet\"\n"
diff --git a/mkdio.c b/mkdio.c
index fd6105d..15606aa 100644
--- a/mkdio.c
+++ b/mkdio.c
@@ -215,9 +215,6 @@ void
 mkd_string_to_anchor(char *s, int len, mkd_sta_function_t outchar,
 				       void *out, int labelformat)
 {
-#if WITH_URLENCODED_ANCHOR
-    static const unsigned char hexchars[] = "0123456789abcdef";
-#endif
     unsigned char c;
 
     int i, size;
@@ -225,25 +222,15 @@ mkd_string_to_anchor(char *s, int len, mkd_sta_function_t outchar,
 
     size = mkd_line(s, len, &line, IS_LABEL);
     
-#if !WITH_URLENCODED_ANCHOR
     if ( labelformat && (size>0) && !isalpha(line[0]) )
 	(*outchar)('L',out);
-#endif
     for ( i=0; i < size ; i++ ) {
 	c = line[i];
 	if ( labelformat ) {
 	    if ( isalnum(c) || (c == '_') || (c == ':') || (c == '-') || (c == '.' ) )
 		(*outchar)(c, out);
 	    else
-#if WITH_URLENCODED_ANCHOR
-	    {
-		(*outchar)('%', out);
-		(*outchar)(hexchars[c >> 4 & 0xf], out);
-		(*outchar)(hexchars[c      & 0xf], out);
-	    }
-#else
 		(*outchar)('.', out);
-#endif
 	}
 	else
 	    (*outchar)(c,out);
diff --git a/theme.1 b/theme.1
index d740b77..3fc0fbf 100644
--- a/theme.1
+++ b/theme.1
@@ -157,4 +157,4 @@ utility exits 0 on success, and >0 if an error occurs.
 .Xr mkd-extensions 7 .
 .Sh AUTHOR
 .An David Parsons
-.Pq Li orc@pell.chi.il.us
+.Pq Li orc@pell.portland.or.us