diff --git a/General.pm b/General.pm
index bac1382..64d4d0c 100644
--- a/General.pm
+++ b/General.pm
@@ -109,6 +109,7 @@ sub _open {
       # patch by "Manuel Valente" <manuel@ripe.net>:
       if (!$hierend) {
 	s/(?<!\\)#.+$//;                          # Remove comments
+	next if /^#/;                             # Remove lines beginning with "#"
 	next if /^\s*$/;                          # Skip empty lines
 	s/\\#/#/g;                                # remove the \ char in front of masked "#"
       }
diff --git a/Makefile.old b/Makefile.old
index eaa01b5..bf35dea 100644
--- a/Makefile.old
+++ b/Makefile.old
@@ -18,23 +18,23 @@
 
 # --- MakeMaker const_config section:
 
-# These definitions are from config.sh (via /usr/lib/perl5/5.6.0/i686-linux/Config.pm)
+# These definitions are from config.sh (via /usr/lib/perl5/5.6.0/i386-linux/Config.pm)
 
 # They may have been overridden via Makefile.PL or on the command line
 AR = ar
-CC = cc
-CCCDLFLAGS = -fpic
+CC = gcc
+CCCDLFLAGS = -fPIC
 CCDLFLAGS = -rdynamic
 DLEXT = so
 DLSRC = dl_dlopen.xs
-LD = cc
+LD = gcc
 LDDLFLAGS = -shared -L/usr/local/lib
 LDFLAGS =  -L/usr/local/lib
-LIBC = /lib/libc-2.1.3.so
+LIBC = /lib/libc-2.1.92.so
 LIB_EXT = .a
 OBJ_EXT = .o
 OSNAME = linux
-OSVERS = 2.2.14-5.0
+OSVERS = 2.2.5-22smp
 RANLIB = :
 SO = so
 EXE_EXT = 
@@ -46,9 +46,9 @@ AR_STATIC_ARGS = cr
 NAME = Config::General
 DISTNAME = Config-General
 NAME_SYM = Config_General
-VERSION = 1.17
-VERSION_SYM = 1_17
-XS_VERSION = 1.17
+VERSION = 1.20
+VERSION_SYM = 1_20
+XS_VERSION = 1.20
 INST_BIN = blib/bin
 INST_EXE = blib/script
 INST_LIB = blib/lib
@@ -57,20 +57,20 @@ INST_SCRIPT = blib/script
 PREFIX = /usr
 INSTALLDIRS = site
 INSTALLPRIVLIB = $(PREFIX)/lib/perl5/5.6.0
-INSTALLARCHLIB = $(PREFIX)/lib/perl5/5.6.0/i686-linux
+INSTALLARCHLIB = $(PREFIX)/lib/perl5/5.6.0/i386-linux
 INSTALLSITELIB = $(PREFIX)/lib/perl5/site_perl/5.6.0
-INSTALLSITEARCH = $(PREFIX)/lib/perl5/site_perl/5.6.0/i686-linux
+INSTALLSITEARCH = $(PREFIX)/lib/perl5/site_perl/5.6.0/i386-linux
 INSTALLBIN = $(PREFIX)/bin
 INSTALLSCRIPT = $(PREFIX)/bin
 PERL_LIB = /usr/lib/perl5/5.6.0
-PERL_ARCHLIB = /usr/lib/perl5/5.6.0/i686-linux
+PERL_ARCHLIB = /usr/lib/perl5/5.6.0/i386-linux
 SITELIBEXP = /usr/lib/perl5/site_perl/5.6.0
-SITEARCHEXP = /usr/lib/perl5/site_perl/5.6.0/i686-linux
+SITEARCHEXP = /usr/lib/perl5/site_perl/5.6.0/i386-linux
 LIBPERL_A = libperl.a
 FIRST_MAKEFILE = Makefile
 MAKE_APERL_FILE = Makefile.aperl
 PERLMAINCC = $(CC)
-PERL_INC = /usr/lib/perl5/5.6.0/i686-linux/CORE
+PERL_INC = /usr/lib/perl5/5.6.0/i386-linux/CORE
 PERL = /usr/bin/perl
 FULLPERL = /usr/bin/perl
 FULL_AR = /usr/bin/ar
@@ -109,11 +109,11 @@ MAN1PODS =
 MAN3PODS = General.pm
 HTMLEXT = html
 INST_MAN1DIR = blib/man1
-INSTALLMAN1DIR = /usr/man/man1
+INSTALLMAN1DIR = $(PREFIX)/share/man/man1
 MAN1EXT = 1
 INST_MAN3DIR = blib/man3
-INSTALLMAN3DIR = /usr/man/man3
-MAN3EXT = 3
+INSTALLMAN3DIR = $(PREFIX)/share/man/man3
+MAN3EXT = 3pm
 PERM_RW = 644
 PERM_RWX = 755
 
@@ -168,7 +168,7 @@ AUTOSPLITFILE = $(PERL) "-I$(PERL_ARCHLIB)" "-I$(PERL_LIB)" -e 'use AutoSplit;au
 SHELL = /bin/sh
 CHMOD = chmod
 CP = cp
-LD = cc
+LD = gcc
 MV = mv
 NOOP = $(SHELL) -c true
 RM_F = rm -f
@@ -290,21 +290,21 @@ config :: $(INST_ARCHAUTODIR)/.exists
 config :: $(INST_AUTODIR)/.exists
 	@$(NOOP)
 
-$(INST_AUTODIR)/.exists :: /usr/lib/perl5/5.6.0/i686-linux/CORE/perl.h
+$(INST_AUTODIR)/.exists :: /usr/lib/perl5/5.6.0/i386-linux/CORE/perl.h
 	@$(MKPATH) $(INST_AUTODIR)
-	@$(EQUALIZE_TIMESTAMP) /usr/lib/perl5/5.6.0/i686-linux/CORE/perl.h $(INST_AUTODIR)/.exists
+	@$(EQUALIZE_TIMESTAMP) /usr/lib/perl5/5.6.0/i386-linux/CORE/perl.h $(INST_AUTODIR)/.exists
 
 	-@$(CHMOD) $(PERM_RWX) $(INST_AUTODIR)
 
-$(INST_LIBDIR)/.exists :: /usr/lib/perl5/5.6.0/i686-linux/CORE/perl.h
+$(INST_LIBDIR)/.exists :: /usr/lib/perl5/5.6.0/i386-linux/CORE/perl.h
 	@$(MKPATH) $(INST_LIBDIR)
-	@$(EQUALIZE_TIMESTAMP) /usr/lib/perl5/5.6.0/i686-linux/CORE/perl.h $(INST_LIBDIR)/.exists
+	@$(EQUALIZE_TIMESTAMP) /usr/lib/perl5/5.6.0/i386-linux/CORE/perl.h $(INST_LIBDIR)/.exists
 
 	-@$(CHMOD) $(PERM_RWX) $(INST_LIBDIR)
 
-$(INST_ARCHAUTODIR)/.exists :: /usr/lib/perl5/5.6.0/i686-linux/CORE/perl.h
+$(INST_ARCHAUTODIR)/.exists :: /usr/lib/perl5/5.6.0/i386-linux/CORE/perl.h
 	@$(MKPATH) $(INST_ARCHAUTODIR)
-	@$(EQUALIZE_TIMESTAMP) /usr/lib/perl5/5.6.0/i686-linux/CORE/perl.h $(INST_ARCHAUTODIR)/.exists
+	@$(EQUALIZE_TIMESTAMP) /usr/lib/perl5/5.6.0/i386-linux/CORE/perl.h $(INST_ARCHAUTODIR)/.exists
 
 	-@$(CHMOD) $(PERM_RWX) $(INST_ARCHAUTODIR)
 
@@ -312,9 +312,9 @@ config :: $(INST_MAN3DIR)/.exists
 	@$(NOOP)
 
 
-$(INST_MAN3DIR)/.exists :: /usr/lib/perl5/5.6.0/i686-linux/CORE/perl.h
+$(INST_MAN3DIR)/.exists :: /usr/lib/perl5/5.6.0/i386-linux/CORE/perl.h
 	@$(MKPATH) $(INST_MAN3DIR)
-	@$(EQUALIZE_TIMESTAMP) /usr/lib/perl5/5.6.0/i686-linux/CORE/perl.h $(INST_MAN3DIR)/.exists
+	@$(EQUALIZE_TIMESTAMP) /usr/lib/perl5/5.6.0/i386-linux/CORE/perl.h $(INST_MAN3DIR)/.exists
 
 	-@$(CHMOD) $(PERM_RWX) $(INST_MAN3DIR)
 
@@ -648,7 +648,7 @@ testdb_static :: testdb_dynamic
 # --- MakeMaker ppd section:
 # Creates a PPD (Perl Package Description) for a binary distribution.
 ppd:
-	@$(PERL) -e "print qq{<SOFTPKG NAME=\"Config-General\" VERSION=\"1,17,0,0\">\n}. qq{\t<TITLE>Config-General</TITLE>\n}. qq{\t<ABSTRACT></ABSTRACT>\n}. qq{\t<AUTHOR></AUTHOR>\n}. qq{\t<IMPLEMENTATION>\n}. qq{\t\t<OS NAME=\"$(OSNAME)\" />\n}. qq{\t\t<ARCHITECTURE NAME=\"i686-linux\" />\n}. qq{\t\t<CODEBASE HREF=\"\" />\n}. qq{\t</IMPLEMENTATION>\n}. qq{</SOFTPKG>\n}" > Config-General.ppd
+	@$(PERL) -e "print qq{<SOFTPKG NAME=\"Config-General\" VERSION=\"1,20,0,0\">\n}. qq{\t<TITLE>Config-General</TITLE>\n}. qq{\t<ABSTRACT></ABSTRACT>\n}. qq{\t<AUTHOR></AUTHOR>\n}. qq{\t<IMPLEMENTATION>\n}. qq{\t\t<OS NAME=\"$(OSNAME)\" />\n}. qq{\t\t<ARCHITECTURE NAME=\"i386-linux\" />\n}. qq{\t\t<CODEBASE HREF=\"\" />\n}. qq{\t</IMPLEMENTATION>\n}. qq{</SOFTPKG>\n}" > Config-General.ppd
 
 # --- MakeMaker pm_to_blib section: