diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4b0ffe4d5..97fe22e7f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -149,6 +149,9 @@ if((ZM_TARGET_DISTRO STREQUAL "f21") OR (ZM_TARGET_DISTRO STREQUAL "f22"))
 	set(ZM_SOCKDIR "/var/lib/zoneminder/sock")
 	set(ZM_TMPDIR "/var/lib/zoneminder/temp")
 	set(ZM_LOGDIR "/var/log/zoneminder")
+	set(ZM_CONFIG_DIR "/etc/zm")
+	set(ZM_WEBDIR "/usr/share/zoneminder/www")
+	set(ZM_CGIDIR "/usr/libexec/zoneminder/cgi-bin")
 elseif(ZM_TARGET_DISTRO STREQUAL "el6")
 	set(ZM_RUNDIR "/var/run/zoneminder")
 	set(ZM_SOCKDIR "/var/lib/zoneminder/sock")
diff --git a/distros/fedora/zoneminder.f21.spec b/distros/fedora/zoneminder.f21.spec
index c1875cf5a..6dfabceea 100644
--- a/distros/fedora/zoneminder.f21.spec
+++ b/distros/fedora/zoneminder.f21.spec
@@ -127,7 +127,7 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README.md distros/fedora/README.Fedora distros/fedora/jscalendar-doc
-%config %attr(640,root,%{zmgid_final}) /etc/zm.conf
+%config %attr(640,root,%{zmgid_final}) /etc/zm/zm.conf
 %config(noreplace) %attr(644,root,root) /etc/httpd/conf.d/zoneminder.conf
 %config(noreplace) /etc/tmpfiles.d/zoneminder.conf
 %config(noreplace) /etc/logrotate.d/zoneminder
diff --git a/distros/fedora/zoneminder.f22.spec b/distros/fedora/zoneminder.f22.spec
index 95595270d..8e98f3693 100644
--- a/distros/fedora/zoneminder.f22.spec
+++ b/distros/fedora/zoneminder.f22.spec
@@ -139,7 +139,7 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README.md distros/fedora/README.Fedora distros/fedora/jscalendar-doc
-%config %attr(640,root,%{zmgid_final}) /etc/zm.conf
+%config %attr(640,root,%{zmgid_final}) /etc/zm/zm.conf
 %config(noreplace) %attr(644,root,root) /etc/httpd/conf.d/zoneminder.conf
 %config(noreplace) /etc/tmpfiles.d/zoneminder.conf
 %config(noreplace) /etc/logrotate.d/zoneminder