diff --git a/Makefile.am b/Makefile.am
index e75c135c1b..9d2f571b5f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,6 +48,11 @@ EXTRA_DIST		= $(filter-out ${NODIST_BUILT_SOURCES},${BUILT_SOURCES}) VERSION.txt
 			  .astylerc
 
 
+pkgdatadir = $(datadir)/syslog-ng
+pkgincludedir = $(includedir)/syslog-ng
+pkglibdir = $(libdir)/syslog-ng
+pkglibexecdir = $(libexecdir)/syslog-ng
+
 pkgconfigdir		= $(libdir)/pkgconfig
 pkgconfig_DATA		= syslog-ng.pc
 
diff --git a/configure.ac b/configure.ac
index cc7916b938..d235e7ee42 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2212,7 +2212,7 @@ AC_DEFINE_UNQUOTED(PATH_LOCALSTATEDIR, "$localstatedir", [local state directory]
 AC_DEFINE_UNQUOTED(PATH_PIDFILEDIR, "$pidfiledir", [local state directory])
 AC_DEFINE_UNQUOTED(PATH_DATAROOTDIR, "$datarootdir", [data root directory])
 AC_DEFINE_UNQUOTED(PATH_DATADIR, "$datadir", [data directory])
-AC_DEFINE_UNQUOTED(PATH_PKGDATADIR, "$datadir/$PACKAGE", [pkgdata directory])
+AC_DEFINE_UNQUOTED(PATH_PKGDATADIR, "$datadir/syslog-ng", [pkgdata directory])
 AC_DEFINE_UNQUOTED(PATH_CONFIG_INCLUDEDIR, "$config_includedir", [include directory])
 AC_DEFINE_UNQUOTED(PATH_SCLDIR, "$scldir", [SCL directory])
 AC_DEFINE_UNQUOTED(PATH_XSDDIR, "$xsddir", [XSD directory])