--- Makefile.orig	Mon Nov  4 15:18:57 1996
+++ Makefile	Mon Nov  4 15:37:49 1996
@@ -12,7 +12,7 @@
 # set DBLIBS to be -lneededlibrary if needed
 #DBLIBS	= -ldbz
 #DBLIBS	= /usr/local/lib/dbz.o #/usr/local/lib/dbzdbm.o
-#DBLIBS	= -ldbm
+DBLIBS	= -lndbm
 # add the resolver library if needed
 #RESLIB = -lresolv
 # add the kmem library if needed 
@@ -20,11 +20,11 @@
 #Uncomment the following for Solaris (and similiar SVR4 systems)
 #KVMLIB = -lelf
 # Where nntpd is going to live
-ETCDIR = /etc
+ETCDIR = /usr/sbin
 # Where nntpxmit and nntpxfer is going to live
-BINDIR = /usr/local/bin
+BINDIR = /usr/bin
 # Where manual pages live
-MANDIR = /usr/local/man
+MANDIR = /usr/man
 #
 LIBS = $(DBLIBS) $(RESLIB) $(NETLIBS) $(KVMLIB)
 SUBMAKEFLAGS="LIBS=${LIBS}" "CFLAGS=${CFLAGS}" "ETCDIR=${ETCDIR}" "BINDIR=${BINDIR}" "MANDIR=${MANDIR}"
--- conf.h.dist.orig	Mon Nov  4 15:19:45 1996
+++ ./conf.h.dist	Mon Nov  4 15:26:33 1996
@@ -11,10 +11,10 @@
 #undef	ALONE		/* True if we're running without inetd */
 
 #ifdef ALONE
-#undef	FASTFORK        /* True if we don't want to read active file on start*/
+#define	FASTFORK        /* True if we don't want to read active file on start*/
 #endif
 
-#define LOAD 5	        /* Loadav above which server refuses connections */
+#define LOAD 8	        /* Loadav above which server refuses connections */
 /*
  * If you want the article array to be dynamically allocated instead of
  * being fixed at a preset size, define DYNAMIC_ART_ARRAY.
@@ -70,9 +70,9 @@
 			/* typedefs for u_long */
 #define VOIDSIG		/* Newfangled signal() returns void, old returns int */
 
-#undef MMAP		/* if your OS supports mmap() */
+#define MMAP		/* if your OS supports mmap() */
 
-#undef DIRENT		/* If you have <dirent.h> define this */
+#define DIRENT		/* If you have <dirent.h> define this */
 
 /*
  * If you DON'T have vfork, make this "#define vfork fork"
@@ -95,7 +95,7 @@
 
 /* Things that vary in network implementations */
 #define	SUBNET		/* If you have 4.3 subnetting */
-#undef	DAMAGED_NETMASK	/* If your subnet mask is not a multiple of */
+#define	DAMAGED_NETMASK	/* If your subnet mask is not a multiple of */
 			/* four bits (e.g., UCSD) */
 
 #undef	NETMASK		/* If you don't have subnet ioctls, define */
@@ -110,7 +110,7 @@
  * if you are running BNEWS. At least, not yet. :-)
  */
 
-/* #define UMASK 022 */
+#define UMASK 022
 
 /*
  * If you have the syslog library routine, define SYSLOG to
@@ -133,7 +133,7 @@
  */
 
 /*#define FAKESYSLOG	"/usr/lib/news/nntplog"*/
-#undef	FAKEAPPEND
+#define	FAKEAPPEND
 
 #define	SYSLOG	LOG_NEWS
 
@@ -215,7 +215,7 @@
  * Person (user name) to post news as.
  */
 
-#define	POSTER		"usenet"
+#define	POSTER		"news"
 
 /*
  * Define DOMAINMATCH if you want to use domain specifications in the 
@@ -262,7 +262,7 @@
 #define SUBSCRIPTIONS_FILE	"/usr/lib/news/subscriptions"
 #define NEWSGROUPS_FILE	"/usr/lib/news/newsgroups"
 #define HISTORY_FILE	"/usr/lib/news/history"
-#define	SPOOLDIR	"/usr/spool/news"
+#define	SPOOLDIR	"/var/spool/news"
 #define INEWS		"/usr/lib/news/inews"
 #define RNEWS		"/usr/bin/rnews"		/* Link to inews? */
 
--- server/misc.c.orig	Mon Nov  4 15:27:23 1996
+++ server/misc.c	Mon Nov  4 15:28:47 1996
@@ -695,7 +695,7 @@
  */
 #ifndef READ_SUPER
 #ifndef SVR4
-#if defined(sun) || defined(hpux) || defined(pyr) || defined(hp300) || defined(NeXT)
+#if defined(sun) || defined(hpux) || defined(pyr) || defined(hp300) || defined(NeXT) || defined(linux)
 #include <sys/vfs.h>
 #define statfilesys	statfs		/* routine to call when trying to  */
 					/* stat a file system to get the # */
@@ -965,7 +965,7 @@
 **		none.
 */
 
-#if defined(USG) && !defined(SVR4)
+#if (defined(USG) && !defined(SVR4)) || defined(linux)
 int
 getla()
 {
--- server/common.h.orig	Mon Nov  4 15:26:54 1996
+++ server/common.h	Mon Nov  4 15:27:18 1996
@@ -86,7 +86,7 @@
 #ifdef TIMEOUT
 #ifdef	USG
 #include <sys/time.h>
-#if !defined(SVR4) && !defined(hpux)
+#if !defined(SVR4) && !defined(hpux) && !defined(linux)
 typedef	struct { int fds_bits[1]; }	fd_set;
 #endif
 #endif
--- support/acttimes.c.orig	Mon Nov  4 15:29:00 1996
+++ support/acttimes.c	Mon Nov  4 15:29:29 1996
@@ -25,6 +25,7 @@
 #ifdef NNTP_SUPPORT
 #include "../conf.h"
 #endif
+#define USG
 #ifdef USG
 #include <time.h>
 #else
--- xfer/nntpxfer.c.orig	Mon Nov  4 15:29:48 1996
+++ xfer/nntpxfer.c	Mon Nov  4 15:30:29 1996
@@ -454,11 +454,13 @@
 #ifdef apollo
 		rd_fp->_flag |= _SIERR;
 #else
+#if 0
 # if defined(BSD_44) && !defined(__osf__)
 		rd_fp->_flags |= __SERR;
 # else
 		rd_fp->_flag |= _IOERR;		/* set stdio error */
 # endif
+#endif
 #endif
 #ifndef ETIMEDOUT
 		errno = EPIPE;		/* USG doesn't have ETIMEDOUT */
--- xmit/remote.c.orig	Mon Nov  4 15:30:50 1996
+++ xmit/remote.c	Mon Nov  4 15:31:43 1996
@@ -333,10 +333,12 @@
 #ifdef apollo
 		fp->_flag |= _SIERR;
 #else
-#if defined(BSD_44) && !defined(__osf__)
+#if defined(BSD_44) && !defined(__osf__) && !defined(linux)
 		fp->_flags |= __SERR;		/* set stdio error */
 # else
+#if 0
 		fp->_flag |= _IOERR;		/* set stdio error */
+#endif
 # endif
 #endif
 #ifndef ETIMEDOUT