diff --git a/Changes b/Changes
index 01bd2ba..dc20462 100644
--- a/Changes
+++ b/Changes
@@ -1691,7 +1691,7 @@ Feature async nameserver behaviour.
       their own select loop.
 
    He also supplied example code for which he is hereby acknowledged.
-   The patch was not used because simultaneously Robert Martin-Leg�ne
+   The patch was not used because simultaneously Robert Martin-Legène
    supplied a patch to Nameservers.pm that allowed the same async
    functionality through the use of loop_once method. Robert M-L's 
    code also carefully manages the TCP sockets, so that they can 
@@ -1774,7 +1774,7 @@ Fix rt.cpan.org 13534
 
 Doc rt.cpan.org 13387
 
-    Documented the BUG caught by Robert Martin-Leg�ne
+    Documented the BUG caught by Robert Martin-Legène
     Net::DNS::Nameserver running with multiple IP interfaces might
     violate section 4 of RFC2181.
 
diff --git a/Changes.iconv b/Changes.iconv
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Changes.iconv
diff --git a/demo/axfr b/demo/axfr
old mode 100755
new mode 100644
index ee0e9fe..0b74d6b
--- a/demo/axfr
+++ b/demo/axfr
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl -w
+#!/usr/bin/perl -w
 # $Id: axfr 264 2005-04-06 09:16:15Z olaf $
 
 use strict;
diff --git a/demo/check_soa b/demo/check_soa
old mode 100755
new mode 100644
index 7f451a8..3d24baa
--- a/demo/check_soa
+++ b/demo/check_soa
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl -w
+#!/usr/bin/perl -w
 # $Id: check_soa 264 2005-04-06 09:16:15Z olaf $
 
 =head1 NAME
diff --git a/demo/check_zone b/demo/check_zone
old mode 100755
new mode 100644
index 7254f1c..9e4c9e3
--- a/demo/check_zone
+++ b/demo/check_zone
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl -w
+#!/usr/bin/perl -w
 # $Id: check_zone 264 2005-04-06 09:16:15Z olaf $
 
 =head1 NAME
diff --git a/demo/example_recurse.pl b/demo/example_recurse.pl
old mode 100755
new mode 100644
index bbcccff..3046d8a
--- a/demo/example_recurse.pl
+++ b/demo/example_recurse.pl
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl -w
+#!/usr/bin/perl -w
 
 # Example usage for Net::DNS::Resolver::Recurse
 # Performs recursion for a query.
diff --git a/demo/mresolv b/demo/mresolv
old mode 100755
new mode 100644
index 4c816bb..b5a8713
--- a/demo/mresolv
+++ b/demo/mresolv
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl -w
+#!/usr/bin/perl -w
 # $Id: mresolv 264 2005-04-06 09:16:15Z olaf $
 
 =head1 NAME
diff --git a/demo/mx b/demo/mx
old mode 100755
new mode 100644
index 38def65..f2b1579
--- a/demo/mx
+++ b/demo/mx
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl -w
+#!/usr/bin/perl -w
 # $Id: mx 264 2005-04-06 09:16:15Z olaf $
 
 =head1 NAME
diff --git a/demo/perldig b/demo/perldig
old mode 100755
new mode 100644
index 28a2b6d..0630d96
--- a/demo/perldig
+++ b/demo/perldig
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl -w
+#!/usr/bin/perl -w
 # $Id: perldig 264 2005-04-06 09:16:15Z olaf $
 
 =head1 NAME
diff --git a/demo/trace_dns.pl b/demo/trace_dns.pl
old mode 100755
new mode 100644
index 6e13753..4933602
--- a/demo/trace_dns.pl
+++ b/demo/trace_dns.pl
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
 
 use strict;
 use warnings;