diff -Nurd -X.diff_ignore freeciv/configure.ac freeciv/configure.ac
--- freeciv/configure.ac	2012-06-25 00:39:42.000000000 +0300
+++ freeciv/configure.ac	2012-07-05 05:49:12.000000000 +0300
@@ -1113,6 +1113,8 @@
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <signal.h>]], [[signal (SIGPIPE, SIG_IGN)]])],[AC_MSG_RESULT([yes])
                 AC_DEFINE(HAVE_SIGPIPE, 1, [sigpipe support])],[AC_MSG_RESULT([no])])
 
+FC_CONF_PATH="$sysconfdir/freeciv"
+
 dnl export where the datadir is going to be installed
 FC_EXPAND_DIR(FREECIV_DATADIR, "$datadir/freeciv")
 
@@ -1125,6 +1127,7 @@
   DEFAULT_SAVE_PATH=".:~/.freeciv/saves"
   DEFAULT_SCENARIO_PATH=".:data/scenarios:~/.freeciv/$DATASUBDIR/scenarios:~/.freeciv/scenarios:$datadir/freeciv/scenarios"
 fi
+CPPFLAGS="$CPPFLAGS -DFC_CONF_PATH=\"\\\"$FC_CONF_PATH\\\"\""
 CPPFLAGS="$CPPFLAGS -DDEFAULT_DATA_PATH=\"\\\"$DEFAULT_DATA_PATH\\\"\""
 CPPFLAGS="$CPPFLAGS -DDEFAULT_SAVES_PATH=\"\\\"$DEFAULT_SAVES_PATH\\\"\""
 CPPFLAGS="$CPPFLAGS -DDEFAULT_SCENARIO_PATH=\"\\\"$DEFAULT_SCENARIO_PATH\\\"\""
diff -Nurd -X.diff_ignore freeciv/data/Makefile.am freeciv/data/Makefile.am
--- freeciv/data/Makefile.am	2012-04-14 02:53:05.000000000 +0300
+++ freeciv/data/Makefile.am	2012-07-05 05:44:03.000000000 +0300
@@ -1,5 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
+pkgsysconfdir = $(sysconfdir)/$(PACKAGE)
+
 if CLIENT
 CLIENT_FILES =				\
 	hex2t.tilespec			\
@@ -24,16 +26,20 @@
 
 if SERVER
 SERVER_FILES = \
-	database.lua \
 	civ1.serv \
 	civ2.serv \
 	default.serv \
 	experimental.serv \
 	multiplayer.serv
+
+SERVER_CONF = database.lua
+
 else
 SERVER_FILES =
+SERVER_CONF =
 endif
 
+pkgsysconf_DATA = $(SERVER_CONF)
 pkgdata_DATA = $(SERVER_FILES) $(CLIENT_FILES)
 
 # Freeciv.rc was originally for gui-gtk but is also used by gui-sdl
diff -Nurd -X.diff_ignore freeciv/server/scripting/script_fcdb.c freeciv/server/scripting/script_fcdb.c
--- freeciv/server/scripting/script_fcdb.c	2012-03-17 00:56:40.000000000 +0200
+++ freeciv/server/scripting/script_fcdb.c	2012-07-05 05:50:14.000000000 +0300
@@ -189,11 +189,11 @@
 
   if (!fcdb_luafile) {
     /* Use default freeciv database lua file. */
-    fcdb_luafile = fileinfoname(get_data_dirs(), SCRIPT_FCDB_LUA_FILE);
+    fcdb_luafile = fileinfoname(FC_CONF_PATH, SCRIPT_FCDB_LUA_FILE);
   }
 
   if (!fcdb_luafile) {
-    log_error("Freeciv database script '%s' not in data path.", fcdb_luafile);
+    log_error("Freeciv database script '%s' not in conf path.", fcdb_luafile);
     return FALSE;
   }