diff --git a/data/y-web/Makefile.am b/data/y-web/Makefile.am
index 20b519e82..e2aba5972 100644
--- a/data/y-web/Makefile.am
+++ b/data/y-web/Makefile.am
@@ -94,6 +94,9 @@ install_DATA = \
 	Y_Wait.yhtm \
 	Y_yWeb.js
 
+configdir = $(CONFIGDIR)
+config_DATA = yWeb.conf
+
 install-data-hook:
 	@# Badass hack, I know. If anyone knows a better way -- please send patch!
 	find $(DESTDIR)$(PRIVATE_HTTPDDIR)/ -type f -print0 | xargs --no-run-if-empty -0 \
diff --git a/src/nhttpd/yWeb.conf b/data/y-web/yWeb.conf
similarity index 100%
rename from src/nhttpd/yWeb.conf
rename to data/y-web/yWeb.conf
diff --git a/src/nhttpd/Makefile.am b/src/nhttpd/Makefile.am
index 69b5b6f01..2177f759c 100644
--- a/src/nhttpd/Makefile.am
+++ b/src/nhttpd/Makefile.am
@@ -18,13 +18,9 @@ AM_CPPFLAGS += \
 	-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
-
-installdir = $(CONFIGDIR)
-install_DATA = yWeb.conf