--- epic4-2.10.1.orig/Makefile.in
+++ epic4-2.10.1/Makefile.in
@@ -125,7 +125,7 @@
 			$(MV) $(IP)$(EPIC_LINK) $(IP)$(EPIC_OLD); \
 		fi; \
 		$(RM) $(IP)$(EPIC_LINK); \
-		ln -s $(epic)-$(VERSION) $(IP)$(EPIC_LINK); \
+		mv -f $(IP)$(EPIC) $(IP)$(EPIC_LINK); \
 	fi
 
 #
@@ -147,6 +147,7 @@
 #
 scriptdir = $(epicdir)/script
 installscript: installdirs test
+	-chmod -x @srcdir@/script/*
 	-@(								\
 		if ./my_test -f $(IP)$(scriptdir)/local; then		\
 			if ./my_test -f script/local; then 		\
@@ -157,25 +158,20 @@
 	)
 	for i in @srcdir@/script/*; \
 	do \
-		if ./my_test -f $$i; then \
-			if ./my_test -x $$i; then \
-				chmod a-x $$i; \
+		target=$(IP)$(scriptdir)/`basename $$i`; \
+		if ./my_test -f $$target; then \
+			if ./my_test $$i -nt $$target; then \
+				$(INSTALL_DATA) $$i $$target; \
 			fi; \
-			target=$(IP)$(scriptdir)/`basename $$i`; \
-			if ./my_test -f $$target; then \
-				if ./my_test $$i -nt $$target; then \
-					$(INSTALL_DATA) $$i $$target; \
-				fi; \
-			elif ./my_test -f $$target.gz; then \
-				if ./my_test $$i -nt $$target.gz; then \
-					$(INSTALL_DATA) $$i $$target; \
-					gzip -f $$target; \
-				fi; \
-			else \
+		elif ./my_test -f $$target.gz; then \
+			if ./my_test $$i -nt $$target.gz; then \
 				$(INSTALL_DATA) $$i $$target; \
-				if ./my_test -f $(IP)$(scriptdir)/gzip-scripts; then \
-					gzip -f $$target; \
-				fi; \
+				gzip -f $$target; \
+			fi; \
+		else \
+			$(INSTALL_DATA) $$i $$target; \
+			if ./my_test -f $(IP)$(scriptdir)/gzip-scripts; then \
+				gzip -f $$target; \
 			fi; \
 		fi; \
 	done
--- epic4-2.10.1.orig/include/config.h
+++ epic4-2.10.1/include/config.h
@@ -42,7 +42,7 @@
  *  the client will NOT compile and work properly!  Use the default here if
  *  you dont have other servers to use.
  */
-#define DEFAULT_SERVER "localhost irc.efnet.net irc.undernet.org irc.dal.net"
+#define DEFAULT_SERVER "irc.debian.org irc.efnet.net irc.undernet.org irc.dal.net"
 
 /*
  * Maildir support is experimental in EPIC4.  More complete support is 
@@ -296,7 +296,7 @@
  * hostname:portnum:password (with the portnum and password being
  * optional).  This server list will supercede the DEFAULT_SERVER
  */
-#define SERVERS_FILE "ircII.servers"
+#define SERVERS_FILE "/etc/epic4/servers"
 
 
 /*
@@ -323,7 +323,7 @@
  * format of what the default load path is to be.  The %s format indicates
  * the runtime IRCLIB value.  This value is only used at startup time.
  */
-#define DEFAULT_IRCPATH "~/.epic:~/.irc:%s/script:."
+#define DEFAULT_IRCPATH ".:~/.epic:~/.irc:/usr/local/share/epic4/script:%s/script"
 
 
 /*
@@ -352,7 +352,7 @@
 #define DEFAULT_BEEP_WHEN_AWAY 1
 #define DEFAULT_BLINK_VIDEO 1
 #define	DEFAULT_BOLD_VIDEO 1
-#define DEFAULT_CHANNEL_NAME_WIDTH 0
+#define DEFAULT_CHANNEL_NAME_WIDTH 16
 #define DEFAULT_CLOCK 1
 #define DEFAULT_CLOCK_24HOUR 0
 #define DEFAULT_CLOCK_FORMAT NULL
@@ -392,7 +392,7 @@
 #define DEFAULT_HELP_PROMPT 1
 #define DEFAULT_HELP_WINDOW 0
 #define DEFAULT_HIDE_PRIVATE_CHANNELS 0
-#define DEFAULT_HIGH_BIT_ESCAPE 2
+#define DEFAULT_HIGH_BIT_ESCAPE 0
 #define DEFAULT_HIGHLIGHT_CHAR "BOLD"
 #define DEFAULT_HISTORY 150
 #define DEFAULT_HISTORY_CIRCLEQ 1
@@ -525,7 +525,7 @@
 #define DEFAULT_VERBOSE_CTCP 1
 #define DEFAULT_WORD_BREAK ".,; \t"
 #define DEFAULT_WSERV_TYPE "screen"
-#define DEFAULT_XTERM "xterm"
+#define DEFAULT_XTERM "x-terminal-emulator"
 #define DEFAULT_XTERM_OPTIONS NULL
 
 /*
--- epic4-2.10.1.orig/doc/epic.1
+++ epic4-2.10.1/doc/epic.1
@@ -1,10 +1,10 @@
 .Dd April 22, 1999
 .Dt EPIC 1
 .Sh NAME
-.Nm epic
+.Nm epic4
 .Nd Internet Relay Chat client for UNIX like systems
 .Sh SYNOPSIS
-.Nm epic
+.Nm epic4
 .Op Ar \-a
 .Op Ar \-b
 .Op Ar \-B
@@ -142,19 +142,20 @@
 If you don't want your users to spoof their usernames, install identd, and do everyone on IRC a favor.
 .It nickname
 The first bare word found is taken as the default nickname to use.  
-This overrides all other options, including the -n option and the 
+This overrides all other options, including the \-n option and the 
 .Ev IRCNICK 
 environment variable.  
 If all else fails, then the client uses your login name as the default nickname.
 .It server,[server]
 After the nickname, a list of one or more server specifications can be listed.
-Unless you specify the -a option, this will replace your default server list!
-The -a option forces any servers listed here to be appended to the default server list.
+Unless you specify the \-a option, this will replace your default server list!
+The \-a option forces any servers listed here to be appended to the default server list.
 The format for server specifications is:
 .sp
 .Dl hostname:port:password:nick
 .sp
 Any item can be omitted by leaving the field blank, and any trailing colons can also be omitted.
+.El
 .Sh "DETAILED DESCRIPTION"
 .Ss "The Screen:"
 The screen is split into two parts, separated by an inverse-video status line (if supported).
@@ -164,16 +165,16 @@
 The lower part of the screen (a single line) accepts keyboard input.
 .sp
 Some terminals do not support certain features required by
-.Nm epic
+.Nm epic4
 , in which case you receive a message stating this.
 If this occurs, try changing the terminal type or run
-.Nm epic
-with the -d option.
+.Nm epic4
+with the \-d option.
 .Ss "Irc Commands:"
 Any line beginning with the slash character 
 .Dq /
 is regarded as an
-.Nm epic
+.Nm epic4
 command (the command character may be changed).  
 Any line not beginning with this character is treated as a message to be sent to the current channel.
 The client has a built in help system.  
@@ -182,7 +183,7 @@
 to open up the help system.
 .Ss "The .ircrc File:"
 When
-.Nm epic
+.Nm epic4
 is executed, it checks the user's home directory for a
 .Pa ~/.ircrc 
 file, executing the commands in the file. 
@@ -191,42 +192,44 @@
 This allows predefinition of aliases and other features.
 .Sh PRACTICAL EXAMPLES
 Certainly any description of 
-.Nm epic 
+.Nm epic4 
 in this man page will be sorely inadequate because most of the confusion doesn't even start until after you get the client to connect to a server.  
 But if you really have problems getting the client to connect to a server, try some of these:
-.Bl -tag -width "epic"
-.It Nm epic
+.Bl -tag -width "epic4"
+.It Nm epic4
 Try this first.  
 This will assume all the defaults.  
-If the person who is maintaining epic at your site has done a halfway decent job, this will put you on a server that is somewhat local to you. 
-.It Nm "epic nickname irc.domain.com"
+If the person who is maintaining epic4 at your site has done a halfway decent job, this will put you on a server that is somewhat local to you. 
+.It Nm "epic4 nickname irc.domain.com"
 or something similar will attempt to connect to the irc server running on the host "irc.domain.com" (fill in a real irc server here) with the nickname of well, "nickname".  
 This is the most common way to specify an alternate server to use.
-.It Nm "epic nickname irc.domain.com:6664"
+.It Nm "epic4 nickname irc.domain.com:6664"
 Sometimes, some servers are really busy, and it can take them a long time to establish a connection with you on the default port (6667).  
 Most major servers on big public networks accept connections on many different ports, with the most common being most or all of the ports between 6660 and 6675.
 You can usually connect much faster if you use a port other than 6667, if the server you're connecting to supports an alternate port.
-.It Nm "epic nickname irc.efnet.net"
+.It Nm "epic4 nickname irc.efnet.net"
 If you're totally stumped and trying to get on efnet, try this.
-.It Nm "epic nickname irc.undernet.org"
+.It Nm "epic4 nickname irc.undernet.org"
 If you're totally stumped and trying to get on undernet, try this.
-.It Nm "epic nickname irc.dal.net"
+.It Nm "epic4 nickname irc.dal.net"
 If you're totally stumped and trying to get on dalnet, try this.
+.El
 .Sh "FILES"
-.Bl -tag -width "/usr/local/share/epic"
-.It Nm /usr/local/bin/epic
+.Bl -tag -width "/usr/share/epic4"
+.It Nm /usr/bin/epic4
 the default location of the binary
 .It Nm ~/.ircrc
 default initialization file
 .It Nm ~/.irc/
 directory you can put your own
-.Nm epic
+.Nm epic4
 scripts into, that can then be loaded with /load
-.It Nm /usr/local/share/epic
+.It Nm /usr/share/epic4
 default directory containing message-of-the-day, master initialization, 
 help files and 
-.Nm epic
+.Nm epic4
 scripts
+.El
 .Sh "THE HELP FILES"
 Starting up the client is the easy part.  
 Once you get connected, you'll probably find you have no idea what you're doing.
@@ -251,7 +254,7 @@
 .Pa <http://www.irchelp.org/>
 Lots of great help for new irc users.
 .Sh "SIGNALS"
-.Nm epic
+.Nm epic4
 handles the following signals gracefully
 .Pp
 .TP
@@ -259,6 +262,7 @@
 .It SIGUSR1
 Closes all DCC connections and EXEC'd processes.
 .Pp
+.El
 .Sh "ENVIRONMENT VARIABLES"
 It can be helpful to predefine certain variables in in the
 .Pa ~/.cshrc
@@ -281,6 +285,7 @@
 .Pa /etc/password
 .It Ev TERM     
 The type of terminal emulation to use
+.El
 .Sh "SEE ALSO"
 .Xr ircd 8
 .Sh BUGS
@@ -297,15 +302,15 @@
 .Sh ERRATA
 The online documentation probably should be in docbook form rather than
 in the current help format.  The entire help system is a hack.
-
-This manual page only describes the options to epic, but doesn't tell
+.PP
+This manual page only describes the options to epic4, but doesn't tell
 you what to do once you get connected.
 .Sh AUTHORS
 Program written by Michael Sandrof (ms5n+@andrew.cmu.edu).
 The copyright holder is Matthew Green (mrg@mame.mu.oz.au).
 This software is maintained by Jeremy Nelson (jnelson@acronet.net)
 on behalf of the EPIC project (list@epicsol.org).
-
+.PP
 At one time or another, this man page has been edited by Darren Reed,
 R.P.C. Rodgers, the lynX, Matthew Green, and Jeremy Nelson.
 .\" end of man page
