diff --git a/ChangeLog b/ChangeLog
index 2a5081bf7..2d2e3fed5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-01-09  Alex Roitman  <shura@gramps-project.org>
+	* src/const.py.in: use proper macros.
+	* src/gramps.py: Correctly define dirs.
+
 2007-01-10  Zsolt Foldvari  <zfoldvar@users.sourceforge.net>
 	* src/Selectors/_BaseSelector.py (__init__, _on_row_activated):
 	enable selection by Double-click or Enter
diff --git a/src/const.py.in b/src/const.py.in
index 985193920..0d4d9b13e 100644
--- a/src/const.py.in
+++ b/src/const.py.in
@@ -63,7 +63,8 @@ convert = "convert"
 pixdir = "/usr/share/pixmaps"
 nautdir = "/usr/share/pixmaps/nautilus"
 
-prefixdir = "@GPREFIX@"
+prefixdir = "@prefix@"
+sysconfdir = "@sysconfdir@"
 
 #-------------------------------------------------------------------------
 #
diff --git a/src/gramps.py b/src/gramps.py
index d6932b5f3..00cbe16e0 100644
--- a/src/gramps.py
+++ b/src/gramps.py
@@ -162,9 +162,8 @@ def run():
         program.set_property('app-libdir',
                              '%s/lib' % const.prefixdir)
         program.set_property('app-datadir',
-                             '%s/share/gramps' % const.prefixdir)
-        program.set_property('app-sysconfdir',
-                             '%s/etc' % const.prefixdir)
+                             '%s/share' % const.prefixdir)
+        program.set_property('app-sysconfdir',const.sysconfdir)
         program.set_property('app-prefix', const.prefixdir)
     except:
         pass