diff --git a/freeipa.spec.in b/freeipa.spec.in
index ba329ecec..de0c401b1 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -572,7 +572,8 @@ fi
 %{_usr}/share/ipa/ui/*.svg
 %{_usr}/share/ipa/ui/*.ttf
 %{_usr}/share/ipa/ui/*.woff
-%config(noreplace) %{_usr}/share/ipa/ui/extension.js
+%dir %{_usr}/share/ipa/ui/ext
+%config(noreplace) %{_usr}/share/ipa/ui/ext/extension.js
 %dir %{_usr}/share/ipa/ui/images
 %{_usr}/share/ipa/ui/images/*.png
 %{_usr}/share/ipa/ui/images/*.gif
diff --git a/install/configure.ac b/install/configure.ac
index c70eef4ad..bb1ec5025 100644
--- a/install/configure.ac
+++ b/install/configure.ac
@@ -75,6 +75,7 @@ AC_CONFIG_FILES([
     migration/Makefile
     share/Makefile
     ui/Makefile
+    ui/ext/Makefile
     ui/images/Makefile
     tools/Makefile
     tools/man/Makefile
diff --git a/install/ui/Makefile.am b/install/ui/Makefile.am
index 6e019ecd9..e4256de91 100644
--- a/install/ui/Makefile.am
+++ b/install/ui/Makefile.am
@@ -3,6 +3,7 @@ AUTOMAKE_OPTIONS = 1.7
 NULL =
 
 SUBDIRS =  				\
+	ext				\
 	images				\
 	$(NULL)
 
@@ -20,7 +21,6 @@ app_DATA =				\
 	dns.js				\
 	entitle.js 			\
 	entity.js 			\
-	extension.js 			\
 	facet.js 			\
 	favicon.ico			\
 	field.js			\
diff --git a/install/ui/ext/Makefile.am b/install/ui/ext/Makefile.am
new file mode 100644
index 000000000..29a6387c6
--- /dev/null
+++ b/install/ui/ext/Makefile.am
@@ -0,0 +1,14 @@
+NULL =
+
+appdir = $(IPA_DATA_DIR)/ui/ext
+app_DATA =				\
+	extension.js 			\
+	$(NULL)
+
+EXTRA_DIST =                            \
+        $(app_DATA)                     \
+        $(NULL)
+
+MAINTAINERCLEANFILES =                  \
+        *~                              \
+        Makefile.in
diff --git a/install/ui/extension.js b/install/ui/ext/extension.js
similarity index 100%
rename from install/ui/extension.js
rename to install/ui/ext/extension.js
diff --git a/install/ui/index.html b/install/ui/index.html
index 6b1be869b..01335d755 100644
--- a/install/ui/index.html
+++ b/install/ui/index.html
@@ -44,7 +44,7 @@
     <script type="text/javascript" src="aci.js"></script>
     <script type="text/javascript" src="entitle.js"></script>
 
-    <script type="text/javascript" src="extension.js"></script>
+    <script type="text/javascript" src="ext/extension.js"></script>
     <script type="text/javascript" src="webui.js"></script>
 
     <link rel="stylesheet" type="text/css" href="jquery-ui.css" />