diff --git a/squid.changes b/squid.changes
index 764c66a..7b88dae 100644
--- a/squid.changes
+++ b/squid.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed May  6 08:32:28 UTC 2015 - mpluskal@suse.com
+
+- Remove emulate_httpd_log from config on update
+
 -------------------------------------------------------------------
 Tue Apr 28 08:59:41 UTC 2015 - mpluskal@suse.com
 
diff --git a/squid.spec b/squid.spec
index e9af7e9..ef41edf 100644
--- a/squid.spec
+++ b/squid.spec
@@ -310,6 +310,10 @@ for i in zh-cn zh-tw; do
 	rm -rf "$error_dir/$i" || true
   fi
 done
+# emulate_httpd_log is gone with 3.5
+if [ -e etc/%{name}/%{name}.conf ]; then
+  sed -i '/emulate_httpd_log/d' /etc/%{name}/%{name}.conf
+fi
 
 %if 0%{?has_systemd}
 %service_add_pre %{name}.service
@@ -330,7 +334,7 @@ done
 if [ "$1" -gt "1" ]; then
   if [ -e etc/%{name}.conf -a ! -L etc/%{name}.conf -a ! -e etc/%{name}/%{name}.conf ]; then
     echo "moving %{_sysconfdir}/%{name}.conf to %{_sysconfdir}/%{name}/%{name}.conf"
-    mv etc/%{name}.conf etc/%{name}/%{name}.conf
+    mv /etc/%{name}.conf /etc/%{name}/%{name}.conf
   fi
   # default group changed from nogroup to squid
   %{_sbindir}/usermod -g %{name} %{name}