diff --git a/fish.changes b/fish.changes
index c1c0a9f..b66cf7d 100644
--- a/fish.changes
+++ b/fish.changes
@@ -1,22 +1,27 @@
+-------------------------------------------------------------------
+Mon Dec  1 10:08:12 UTC 2014 - seanpwatson@live.com
+
+- Fixed conflict with youtube-dl
+
 -------------------------------------------------------------------
 Thu Oct  9 12:05:02 UTC 2014 - seanpwatson@live.com
 
 - update to 2.1.1
 - The fish_config web interface now uses an authentication token 
-to protect requests and only responds to requests from the local 
-machine with this token, preventing a remote code execution attack
-(closing CVE-2014-2914).
+  to protect requests and only responds to requests from the local 
+  machine with this token, preventing a remote code execution
+  attack (closing CVE-2014-2914).
 - psub and funced are no longer vulnerable to attacks which 
-allow local privilege escalation and data tampering (closing 
-CVE-2014-2906 and CVE-2014-3856)
+  allow local privilege escalation and data tampering (closing 
+  CVE-2014-2906 and CVE-2014-3856)
 - fishd uses a secure path for its socket, preventing a local 
-privilege escalation attack (closing CVE-2014-2905)
+  privilege escalation attack (closing CVE-2014-2905)
 - __fish_print_packages is no longer vulnerable to attacks which 
-would allow local privilege escalation and data tampering 
-(closing CVE-2014-3219)
--fishd now ignores SIGPIPE, fixing crashes using tools like 
-GNU Parallel and which occurred more often as a result of 
-the other fishd changes.
+  would allow local privilege escalation and data tampering 
+  (closing CVE-2014-3219)
+- fishd now ignores SIGPIPE, fixing crashes using tools like 
+  GNU Parallel and which occurred more often as a result of 
+  the other fishd changes.
 -------------------------------------------------------------------
 Sat Oct 12 20:34:28 UTC 2013 - mailaender@opensuse.org
 
diff --git a/fish.spec b/fish.spec
index 6a1ec48..b271c65 100644
--- a/fish.spec
+++ b/fish.spec
@@ -66,7 +66,8 @@ fi
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%config(noreplace) %{_sysconfdir}/%{name}
+%dir /etc/fish
+%config(noreplace) %{_sysconfdir}/%{name}/*
 %{_bindir}/*
 %{_datadir}/doc/%{name}
 %{_datadir}/%{name}