diff --git a/src/server/ramkomd.c b/src/server/ramkomd.c
index f57c49b5b995f21372b87907951fbed298be6c9a..07fecd51b4e2541239af48ecddb5d3112461b1a6 100644
--- a/src/server/ramkomd.c
+++ b/src/server/ramkomd.c
@@ -7,10 +7,10 @@
  * It has grown! /ceder
  */
 
-static char *rcsid = "$Id: ramkomd.c,v 0.14 1991/08/28 02:20:47 ceder Exp $";
-
+static char *rcsid = "$Id: ramkomd.c,v 0.15 1991/08/30 01:33:51 ceder Exp $";
 
 
+#include <m-config.h>
 #include <getopt.h>
 #include <stdlib.h>
 #include <signal.h>
@@ -18,7 +18,9 @@ static char *rcsid = "$Id: ramkomd.c,v 0.14 1991/08/28 02:20:47 ceder Exp $";
 #include <ctype.h>
 #include <netdb.h>
 #include <string.h>
+#ifdef HAVE_LOCALE
 #include <locale.h>
+#endif
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/param.h>
@@ -53,12 +55,12 @@ Bool	never_save = FALSE;
 
 
 
-EXPORT char datafilename[1024];   /* Full pathname to the database file */
-EXPORT char backupfilename[1024]; /* Full pathname to the backup file */
-EXPORT char textfilename[1024];	/* Full pathname to the text file. */
-EXPORT char statisticfile[1024];	/* Dito to statistics file. */
-EXPORT char pidfile[1024];		/* Dito pid-file. */
-INTERNAL char memusefile[1024];		/* Memory usage file. */
+EXPORT char datafilename[BUFSIZ];      /* Full pathname to the database file */
+EXPORT char backupfilename[BUFSIZ];    /* Full pathname to the backup file */
+EXPORT char textfilename[BUFSIZ];      /* Full pathname to the text file. */
+EXPORT char statisticfile[BUFSIZ];     /* Dito to statistics file. */
+EXPORT char pidfile[BUFSIZ];	       /* Dito pid-file. */
+INTERNAL char memusefile[BUFSIZ];      /* Memory usage file. */
 
 char ip_client_port[80];        /* Port to listen to for clients */
 char ip_mux_port[80];           /* Port to listen to for mux:es */
@@ -210,11 +212,14 @@ main (int    argc,
     int i;
     FILE *stat_file;
 
+#ifdef HAVE_LOCALE
     if (setlocale(LC_CTYPE, "iso_8859_1") == NULL)
     {
         perror("setlocale");
 	exit(1);
     }
+#endif
+
     s_set_storage_management(string_malloc, string_realloc, string_free);