--- rxvt-unicode/autoconf/Make.common.in	2003/11/24 17:28:08	1.1
+++ rxvt-unicode/autoconf/Make.common.in	2004/03/01 01:06:46	1.4
@@ -3,14 +3,15 @@
 DATE=@DATE@
 LSMDATE=@LSMDATE@
 VERSION=@VERSION@
-VERNAME=rxvt-$(VERSION)#
-MAINT=Geoff Wing#
-MAINTEMAIL=<gcw@rxvt.org>#
-WEBMAINT=Oezguer Kesim#
-WEBMAINTEMAIL=<oec@rxvt.org>#
-WEBPAGE=<http://www.rxvt.org/>#
-FTPSITENAME=ftp.rxvt.org#
-FTPSITEDIR=/pub/rxvt#
+VERNAME=rxvt-unicode-$(VERSION)
+MAINT=Marc A. Lehmann
+MAINTEMAIL=<rxvt@schmorp.de>
+WEBMAINT=Marc A. Lehmann
+WEBMAINTEMAIL=<rxvt@schmorp.de>
+WEBPAGE=<http://www.sourceforge.net/projects/rxvt-unicode/>
+FTPSITENAME=ftp.rxvt.org
+FTPSITEDIR=/pub/rxvt
+
 #-------------------------------------------------------------------------
 RXVTNAME=@RXVTNAME@
 
@@ -69,7 +70,7 @@
 
 LIBTOOL = @LIBTOOL@
 COMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(DEBUG) $(DINCLUDE) $(XINC) -I$(basedir) -I$(srcdir) -I.
-LINK = $(CC) $(CFLAGS) $(LDFLAGS)
+LINK = @LINKER@ $(CFLAGS) $(LDFLAGS)
 
 # End of common section of the Makefile
 #-------------------------------------------------------------------------