diff --git a/src/config-store/wscript b/src/config-store/wscript
index 79203ccc4..bdceb07cc 100644
--- a/src/config-store/wscript
+++ b/src/config-store/wscript
@@ -18,6 +18,8 @@ def configure(conf):
 
 
 def build(bld):
+    bld.install_files('${PREFIX}/include/ns3', '../../ns3/config-store-config.h')
+
     module = bld.create_ns3_module('config-store', ['core', 'network'])
     module.source = [
         'model/attribute-iterator.cc',
diff --git a/src/wscript b/src/wscript
index 220ebabca..293c1ecbe 100644
--- a/src/wscript
+++ b/src/wscript
@@ -432,10 +432,11 @@ class ns3pcfile_task(Task.Task):
         includes = self.env['CPPPATH_%s' % dep]
         return [self.env['CPPPATH_ST'] % include for include in includes]
 
-    def _generate_pcfile(self, name, use, uselib_local, prefix, outfilename):
+    def _generate_pcfile(self, name, use, uselib_local, env, outfilename):
         outfile = open(outfilename, 'w')
-        includedir = os.path.join(prefix, 'include')
-        libdir = os.path.join(prefix, 'lib')
+        prefix = env.PREFIX
+        includedir = os.path.join(env.INCLUDEDIR, "ns3")
+        libdir = env.LIBDIR
         libs = self._self_libs(self.env, name, '${libdir}')
         for dep in use:
             libs = libs + self._lib(self.env, dep)
@@ -463,7 +464,7 @@ Cflags: %s
         output_filename = self.outputs[0].bldpath(self.env)
         self._generate_pcfile(self.module.name, self.module.uselib, 
                               self.module.uselib_local,
-                              self.env['PREFIX'], output_filename)
+                              self.env, output_filename)
 
 class ns3pcfile_taskgen(TaskGen.task_gen):
     def __init__(self, *args, **kwargs):
@@ -473,8 +474,7 @@ class ns3pcfile_taskgen(TaskGen.task_gen):
         output_node = self.path.find_or_declare(output_filename)
         assert output_node is not None, str(self)
         task = self.create_task('ns3pcfile', env=self.env)
-        self.bld.install_files(os.path.join('${PREFIX}', 'lib', 'pkgconfig'),
-                               output_node)
+        self.bld.install_files('${LIBDIR}/pkgconfig', output_node)
         task.set_outputs([output_node])
         task.module = self.module
 
diff --git a/wscript b/wscript
index b47897860..10203db7e 100644
--- a/wscript
+++ b/wscript
@@ -129,6 +129,7 @@ def set_options(opt):
     opt.tool_options('compiler_cc')
     opt.tool_options('compiler_cxx')
     opt.tool_options('cflags')
+    opt.tool_options('gnu_dirs')
 
     opt.add_option('--cwd',
                    help=('Set the working directory for a program.'),
@@ -270,6 +271,10 @@ def configure(conf):
     except Configure.ConfigurationError:
         pass
     conf.check_tool('command', ['waf-tools'])
+    conf.check_tool('gnu_dirs')
+
+    #if os.path.exists('/usr/lib64'):
+    #    conf.env.LIBDIR = os.path.join(conf.env.PREFIX, "lib64")
 
     # create the second environment, set the variant and set its name
     variant_env = conf.env.copy()