diff --git a/src/nhttpd/Makefile.am b/src/nhttpd/Makefile.am
index c78ebbbf8..1e1ea948d 100644
--- a/src/nhttpd/Makefile.am
+++ b/src/nhttpd/Makefile.am
@@ -18,5 +18,10 @@ INCLUDES = \
 	-I$(top_srcdir)/lib/connection \
 	@FREETYPE_CFLAGS@
 
+
 noinst_LIBRARIES = libnhttpd.a
 libnhttpd_a_SOURCES = yhttpd.cpp
+
+libnhttpd_adir = @CONFIGDIR@
+libnhttpd_a_DATA = nhttpd.conf
+EXTRA_DIST = nhttpd.conf nhttpd.conf.in
\ No newline at end of file
diff --git a/src/nhttpd/yconfig.h b/src/nhttpd/yconfig.h
index 3912dc04c..cc6a0170e 100644
--- a/src/nhttpd/yconfig.h
+++ b/src/nhttpd/yconfig.h
@@ -7,6 +7,9 @@
 #ifndef __yconfig_h__
 #define __yconfig_h__
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 // c++
 #include <string>
 #include <map>
@@ -101,30 +104,26 @@
 #define HTTPD_DEFAULT_LANGUAGE 			"English"
 #define AUTHUSER						"root"
 
-#ifndef TARGETPREFIX
-#define TARGETPREFIX					""
-#endif
-
-#define HTTPD_CONFIGDIR 				TARGETPREFIX"/var/tuxbox/config"
+#define HTTPD_CONFIGDIR 				CONFIGDIR
 #define HTTPD_CONFIGFILE				HTTPD_CONFIGDIR"/nhttpd.conf"
 #define YWEB_CONFIGFILE					HTTPD_CONFIGDIR"/Y-Web.conf"
-#define PUBLICDOCUMENTROOT				TARGETPREFIX"/var/httpd"
-#define NEUTRINO_CONFIGFILE				TARGETPREFIX"/var/tuxbox/config/neutrino.conf"
+#define PUBLICDOCUMENTROOT				PUBLIC_HTTPDDIR
+#define NEUTRINO_CONFIGFILE				CONFIGDIR"/neutrino.conf"
 #define HOSTEDDOCUMENTROOT				"/mnt/hosted"
 #define EXTRASDOCUMENTROOT				"/mnt/hosted/extras"
 #define EXTRASDOCUMENTURL				"/hosted/extras"
-#define ZAPITXMLPATH					TARGETPREFIX"/var/tuxbox/config/zapit"
-#define TUXBOX_LOGOS_URL				TARGETPREFIX"/usr/share/neutrino/icons/logos"
+#define ZAPITXMLPATH					CONFIGDIR"/zapit"
+#define TUXBOX_LOGOS_URL				ICONSDIR"/logo"
 
 // switch for Box differences
 #ifdef CONFIG_SYSTEM_TUXBOX
 #define AUTHPASSWORD					"dbox2"
-#define PRIVATEDOCUMENTROOT				TARGETPREFIX"/share/tuxbox/neutrino/httpd-y"
+#define PRIVATEDOCUMENTROOT				DATADIR"/httpd-y"
 #endif
 
 #ifdef CONFIG_SYSTEM_TUXBOX_COOLSTREAM
 #define AUTHPASSWORD					"coolstream"
-#define PRIVATEDOCUMENTROOT				TARGETPREFIX"/share/tuxbox/neutrino/httpd"
+#define PRIVATEDOCUMENTROOT				PRIVATE_HTTPDDIR
 #undef Y_CONFIG_BUILD_AS_DAEMON			// No Daemon
 #endif
 //-----------------------------------------------------------------------------
diff --git a/src/nhttpd/yhttpd_core/Makefile.am b/src/nhttpd/yhttpd_core/Makefile.am
index ec562ae50..cc760e315 100644
--- a/src/nhttpd/yhttpd_core/Makefile.am
+++ b/src/nhttpd/yhttpd_core/Makefile.am
@@ -1,5 +1,6 @@
 INCLUDES = \
 	-I$(srcdir) \
+	-I$(top_srcdir) \
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/src/zapit/include \
 	-I$(top_srcdir)/src \
diff --git a/src/nhttpd/yhttpd_mods/Makefile.am b/src/nhttpd/yhttpd_mods/Makefile.am
index 74d213c4f..95f936555 100644
--- a/src/nhttpd/yhttpd_mods/Makefile.am
+++ b/src/nhttpd/yhttpd_mods/Makefile.am
@@ -1,4 +1,5 @@
 INCLUDES = \
+	-I$(top_srcdir) \
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/src/zapit/include \
 	-I$(top_srcdir)/src \