diff --git a/configure.ac b/configure.ac
index abef733e3..4b661ecef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -533,7 +533,6 @@ AC_CONFIG_FILES([
     init/Makefile
     install/Makefile
     install/certmonger/Makefile
-    install/conf/Makefile
     install/html/Makefile
     install/migration/Makefile
     install/share/Makefile
diff --git a/freeipa.spec.in b/freeipa.spec.in
index b4d2acc92..c1c31e235 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -1504,9 +1504,6 @@ fi
 %ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/httpd/conf.d/ipa-pki-proxy.conf
 %ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/ipa/kdcproxy/ipa-kdc-proxy.conf
 %dir %attr(0755,root,root) %{_sysconfdir}/ipa/dnssec
-%{_usr}/share/ipa/ipa.conf
-%{_usr}/share/ipa/ipa-rewrite.conf
-%{_usr}/share/ipa/ipa-pki-proxy.conf
 %ghost %attr(0644,root,apache) %config(noreplace) %{_usr}/share/ipa/html/ca.crt
 %ghost %attr(0644,root,apache) %{_usr}/share/ipa/html/krb.con
 %ghost %attr(0644,root,apache) %{_usr}/share/ipa/html/krb5.ini
diff --git a/install/Makefile.am b/install/Makefile.am
index f895bccd2..f0ec9c7e1 100644
--- a/install/Makefile.am
+++ b/install/Makefile.am
@@ -6,7 +6,6 @@ NULL =
 
 SUBDIRS =			\
         certmonger		\
-        conf			\
         html			\
         migration		\
         share			\
diff --git a/install/conf/Makefile.am b/install/conf/Makefile.am
deleted file mode 100644
index 751bb16c3..000000000
--- a/install/conf/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-NULL =
-
-appdir = $(IPA_DATA_DIR)
-app_DATA =                              \
-	ipa.conf			\
-	ipa-kdc-proxy.conf.template	\
-	ipa-pki-proxy.conf		\
-	ipa-rewrite.conf		\
-	$(NULL)
-
-EXTRA_DIST =                            \
-        $(app_DATA)                     \
-        $(NULL)
diff --git a/install/share/Makefile.am b/install/share/Makefile.am
index abdf3ac64..536f68194 100644
--- a/install/share/Makefile.am
+++ b/install/share/Makefile.am
@@ -90,6 +90,10 @@ dist_app_DATA =				\
 	gssproxy.conf.template		\
 	kdcproxy.wsgi			\
 	ipakrb5.aug			\
+	ipa.conf.template		\
+	ipa-kdc-proxy.conf.template	\
+	ipa-pki-proxy.conf.template	\
+	ipa-rewrite.conf.template	\
 	$(NULL)
 
 kdcproxyconfdir = $(IPA_SYSCONF_DIR)/kdcproxy
diff --git a/install/conf/ipa-kdc-proxy.conf.template b/install/share/ipa-kdc-proxy.conf.template
similarity index 100%
rename from install/conf/ipa-kdc-proxy.conf.template
rename to install/share/ipa-kdc-proxy.conf.template
diff --git a/install/conf/ipa-pki-proxy.conf b/install/share/ipa-pki-proxy.conf.template
similarity index 100%
rename from install/conf/ipa-pki-proxy.conf
rename to install/share/ipa-pki-proxy.conf.template
diff --git a/install/conf/ipa-rewrite.conf b/install/share/ipa-rewrite.conf.template
similarity index 100%
rename from install/conf/ipa-rewrite.conf
rename to install/share/ipa-rewrite.conf.template
diff --git a/install/conf/ipa.conf b/install/share/ipa.conf.template
similarity index 100%
rename from install/conf/ipa.conf
rename to install/share/ipa.conf.template
diff --git a/ipaserver/install/dogtaginstance.py b/ipaserver/install/dogtaginstance.py
index add7cbd88..d10719104 100644
--- a/ipaserver/install/dogtaginstance.py
+++ b/ipaserver/install/dogtaginstance.py
@@ -232,7 +232,8 @@ class DogtagInstance(service.Service):
     def http_proxy(self):
         """ Update the http proxy file  """
         template_filename = (
-            os.path.join(paths.USR_SHARE_IPA_DIR, "ipa-pki-proxy.conf"))
+            os.path.join(paths.USR_SHARE_IPA_DIR,
+                         "ipa-pki-proxy.conf.template"))
         sub_dict = dict(
             DOGTAG_PORT=8009,
             CLONE='' if self.clone else '#',
diff --git a/ipaserver/install/httpinstance.py b/ipaserver/install/httpinstance.py
index 46764e6aa..186ee4498 100644
--- a/ipaserver/install/httpinstance.py
+++ b/ipaserver/install/httpinstance.py
@@ -217,7 +217,9 @@ class HTTPInstance(service.Service):
 
         target_fname = paths.HTTPD_IPA_CONF
         http_txt = ipautil.template_file(
-            os.path.join(paths.USR_SHARE_IPA_DIR, "ipa.conf"), self.sub_dict)
+            os.path.join(paths.USR_SHARE_IPA_DIR,
+                         "ipa.conf.template"),
+            self.sub_dict)
         self.fstore.backup_file(paths.HTTPD_IPA_CONF)
         http_fd = open(target_fname, "w")
         http_fd.write(http_txt)
@@ -226,7 +228,8 @@ class HTTPInstance(service.Service):
 
         target_fname = paths.HTTPD_IPA_REWRITE_CONF
         http_txt = ipautil.template_file(
-            os.path.join(paths.USR_SHARE_IPA_DIR, "ipa-rewrite.conf"),
+            os.path.join(paths.USR_SHARE_IPA_DIR,
+                         "ipa-rewrite.conf.template"),
             self.sub_dict)
         self.fstore.backup_file(paths.HTTPD_IPA_REWRITE_CONF)
         http_fd = open(target_fname, "w")
diff --git a/ipaserver/install/server/upgrade.py b/ipaserver/install/server/upgrade.py
index 732efcf4f..a36f2ca88 100644
--- a/ipaserver/install/server/upgrade.py
+++ b/ipaserver/install/server/upgrade.py
@@ -1696,14 +1696,17 @@ def upgrade_configuration():
         ds_dirname = dsinstance.config_dirname(ds_serverid)
 
         upgrade_file(sub_dict, paths.HTTPD_IPA_CONF,
-                     os.path.join(paths.USR_SHARE_IPA_DIR, "ipa.conf"))
+                     os.path.join(paths.USR_SHARE_IPA_DIR,
+                                  "ipa.conf.template"))
         upgrade_file(sub_dict, paths.HTTPD_IPA_REWRITE_CONF,
-                     os.path.join(paths.USR_SHARE_IPA_DIR, "ipa-rewrite.conf"))
+                     os.path.join(paths.USR_SHARE_IPA_DIR,
+                                  "ipa-rewrite.conf.template"))
         if ca.is_configured():
             upgrade_file(
                 sub_dict,
                 paths.HTTPD_IPA_PKI_PROXY_CONF,
-                os.path.join(paths.USR_SHARE_IPA_DIR, "ipa-pki-proxy.conf"),
+                os.path.join(paths.USR_SHARE_IPA_DIR,
+                             "ipa-pki-proxy.conf.template"),
                 add=True)
         else:
             if os.path.isfile(paths.HTTPD_IPA_PKI_PROXY_CONF):