diff --git a/freeipa.spec b/freeipa.spec
index 8769aa2..a09928b 100644
--- a/freeipa.spec
+++ b/freeipa.spec
@@ -119,7 +119,7 @@
 
 Name:           freeipa
 Version:        %{VERSION}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        The Identity, Policy and Audit system
 
 Group:          System Environment/Base
@@ -1139,7 +1139,8 @@ touch %{buildroot}%{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so
 mkdir -p %{buildroot}%{_sysconfdir}/cron.d
 %endif # ONLY_CLIENT
 
-
+# Collect templates and filter out non-server ones
+find %{buildroot}%{_usr}/share/ipa -maxdepth 1 -name '*.template' -a ! -name 'freeipa.template' -fprintf server-templates '%{_usr}/share/ipa/%f\n'
 
 %if ! %{ONLY_CLIENT}
 
@@ -1428,7 +1429,7 @@ fi
 %endif # with_python3
 
 
-%files server-common
+%files server-common -f server-templates
 %defattr(-,root,root,-)
 %doc README.md Contributors.txt
 %license COPYING
@@ -1444,7 +1445,6 @@ fi
 %{_usr}/share/ipa/kdcproxy.wsgi
 %{_usr}/share/ipa/*.ldif
 %{_usr}/share/ipa/*.uldif
-%{_usr}/share/ipa/*.template
 %dir %{_usr}/share/ipa/advise
 %dir %{_usr}/share/ipa/advise/legacy
 %{_usr}/share/ipa/advise/legacy/*.template
@@ -1646,9 +1646,7 @@ fi
 %dir %{_localstatedir}/lib/ipa-client/pki
 %dir %{_localstatedir}/lib/ipa-client/sysrestore
 %{_mandir}/man5/default.conf.5*
-%if ! %{ONLY_CLIENT}
 %{_usr}/share/ipa/freeipa.template
-%endif
 
 
 %files python-compat
@@ -1681,9 +1679,7 @@ fi
 %defattr(-,root,root,-)
 %doc README.md Contributors.txt
 %license COPYING
-%if ! %{ONLY_CLIENT}
 %dir %{_usr}/share/ipa
-%endif
 
 
 %if 0%{?with_python3}
@@ -1746,6 +1742,10 @@ fi
 %endif # with_ipatests
 
 %changelog
+* Wed May 16 2018 Alexander Bokovoy <abokovoy@redhat.com> - 4.6.90.pre2-3
+- Fine tune packaging of server templates so that it doesn't include
+  freeipa.template which always go to freeipa-client-common
+
 * Tue May 15 2018 Rob Crittenden <rcritten@redhat.com> - 4.6.90.pre2-2
 - Exclude /usr/share from client-only builds