diff --git a/squid.changes b/squid.changes
index 30d8ccf..ef9eca9 100644
--- a/squid.changes
+++ b/squid.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Oct 15 14:57:13 UTC 2015 - jkeil@suse.de
+
+- Fix rpmlint errors / warnings
+  * systemd-service-without-service_add_pre
+    moved service_add_pre to %pre
+  * non-etc-or-var-file-marked-as-conffile
+    moved mib.txt to /usr/share/snmp/mibs/SQUID-MIB.txt
+    idea taken from Fedora package
+
 -------------------------------------------------------------------
 Thu Oct  8 14:41:53 UTC 2015 - jkeil@suse.de
 
diff --git a/squid.spec b/squid.spec
index 8239740..c596b53 100644
--- a/squid.spec
+++ b/squid.spec
@@ -128,7 +128,6 @@ The most important of these new features are:
   * Basic authentication MSNT helper changes
 
 %prep
-#setup -q -n %{name}-%{version}%{snap}
 %setup -q
 cp %{SOURCE10} .
 # upstream patches after RELEASE
@@ -274,6 +273,11 @@ fdupes -q -n -r %{buildroot}%{_prefix}
  install -D -m644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
 %endif
 
+# Move the MIB definition to the proper place (and name)
+mkdir -p $RPM_BUILD_ROOT/usr/share/snmp/mibs
+mv $RPM_BUILD_ROOT/usr/share/squid/mib.txt \
+  $RPM_BUILD_ROOT/usr/share/snmp/mibs/SQUID-MIB.txt
+
 %pre
 # we need this group for /usr/sbin/pinger
 if [[ -z $(%{_bindir}/getent group %{name} 2>/dev/null) ]]; then
@@ -298,6 +302,10 @@ if [[ $(%{_bindir}/id -nG %{name} 2>/dev/null | grep -q winbind >/dev/null; echo
   %{_sbindir}/usermod -G winbind %{name} 2>/dev/null
 fi
 
+%if 0%{?has_systemd}
+%service_add_pre %{name}.service
+%endif
+
 %pretrans
 # Directory to symlink is not working in RPM so workaround it
 # Occurs when updating from 3.4 to 3.5
@@ -322,10 +330,6 @@ if [ "$1" -gt "1" ]; then
   %{_sbindir}/usermod -g %{name} %{name}
 fi
 
-%if 0%{?has_systemd}
-%service_add_pre %{name}.service
-%endif
-
 %post
 %if 0%{?suse_version} >= 1140
  %if 0%{?set_permissions:1}
@@ -416,11 +420,13 @@ fi
 %config %{_sysconfdir}/permissions.d/%{name}
 %endif
 %dir %{_datadir}/%{name}
+%dir %{_datadir}/snmp
+%dir %{_datadir}/snmp/mibs
 %{_datadir}/%{name}/errors
 %{_datadir}/%{name}/icons
-%config %{_datadir}/%{name}/mib.txt
 %{_datadir}/%{name}/mime.conf
 %{_datadir}/%{name}/mime.conf.default
+%{_datadir}/snmp/mibs/SQUID-MIB.txt
 %{_bindir}/purge
 %{_bindir}/squidclient
 %{_sbindir}/basic_db_auth