8 files changed, 19 insertions, 26 deletions
diff --git a/contrib/unaccent/.gitignore b/contrib/unaccent/.gitignore
index 6d74a7617fd..19b6c5ba425 100644
--- a/contrib/unaccent/.gitignore
+++ b/contrib/unaccent/.gitignore
@@ -1,3 +1,2 @@
-/unaccent.sql
 # Generated subdirectories
 /results/
diff --git a/contrib/unaccent/Makefile b/contrib/unaccent/Makefile
index 254155dcca4..13cd8538d39 100644
--- a/contrib/unaccent/Makefile
+++ b/contrib/unaccent/Makefile
@@ -3,9 +3,10 @@
 MODULE_big = unaccent
 OBJS = unaccent.o
 
-DATA_built = unaccent.sql
-DATA = uninstall_unaccent.sql
+EXTENSION = unaccent
+DATA = unaccent--1.0.sql unaccent--unpackaged--1.0.sql
 DATA_TSEARCH = unaccent.rules
+
 REGRESS = unaccent
 
 # Adjust REGRESS_OPTS because we need a UTF8 database
diff --git a/contrib/unaccent/expected/unaccent.out b/contrib/unaccent/expected/unaccent.out
index a09e00fe5b1..b93105e9c7c 100644
--- a/contrib/unaccent/expected/unaccent.out
+++ b/contrib/unaccent/expected/unaccent.out
@@ -1,6 +1,4 @@
-SET client_min_messages = warning;
-\set ECHO none
-RESET client_min_messages;
+CREATE EXTENSION unaccent;
 -- must have a UTF8 database
 SELECT getdatabaseencoding();
  getdatabaseencoding 
diff --git a/contrib/unaccent/sql/unaccent.sql b/contrib/unaccent/sql/unaccent.sql
index ede938d4795..310213994f3 100644
--- a/contrib/unaccent/sql/unaccent.sql
+++ b/contrib/unaccent/sql/unaccent.sql
@@ -1,8 +1,4 @@
-SET client_min_messages = warning;
-\set ECHO none
-\i unaccent.sql
-\set ECHO all
-RESET client_min_messages;
+CREATE EXTENSION unaccent;
 
 -- must have a UTF8 database
 SELECT getdatabaseencoding();
diff --git a/contrib/unaccent/unaccent.sql.in b/contrib/unaccent/unaccent--1.0.sql
index 6d712e7bb8f..4dc9c3d9c66 100644
--- a/contrib/unaccent/unaccent.sql.in
+++ b/contrib/unaccent/unaccent--1.0.sql
@@ -1,7 +1,4 @@
-/* contrib/unaccent/unaccent.sql.in */
-
--- Adjust this setting to control where the objects get created.
-SET search_path = public;
+/* contrib/unaccent/unaccent--1.0.sql */
 
 CREATE OR REPLACE FUNCTION unaccent(regdictionary, text)
 	RETURNS text
diff --git a/contrib/unaccent/unaccent--unpackaged--1.0.sql b/contrib/unaccent/unaccent--unpackaged--1.0.sql
new file mode 100644
index 00000000000..7b36d29512f
--- /dev/null
+++ b/contrib/unaccent/unaccent--unpackaged--1.0.sql
@@ -0,0 +1,8 @@
+/* contrib/unaccent/unaccent--unpackaged--1.0.sql */
+
+ALTER EXTENSION unaccent ADD function unaccent(regdictionary,text);
+ALTER EXTENSION unaccent ADD function unaccent(text);
+ALTER EXTENSION unaccent ADD function unaccent_init(internal);
+ALTER EXTENSION unaccent ADD function unaccent_lexize(internal,internal,internal,internal);
+ALTER EXTENSION unaccent ADD text search template unaccent;
+ALTER EXTENSION unaccent ADD text search dictionary unaccent;
diff --git a/contrib/unaccent/unaccent.control b/contrib/unaccent/unaccent.control
new file mode 100644
index 00000000000..200d2ae7bb4
--- /dev/null
+++ b/contrib/unaccent/unaccent.control
@@ -0,0 +1,5 @@
+# unaccent extension
+comment = 'text search dictionary that removes accents'
+default_version = '1.0'
+module_pathname = '$libdir/unaccent'
+relocatable = true
diff --git a/contrib/unaccent/uninstall_unaccent.sql b/contrib/unaccent/uninstall_unaccent.sql
deleted file mode 100644
index 6879d4f74c6..00000000000
--- a/contrib/unaccent/uninstall_unaccent.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-/* contrib/unaccent/uninstall_unaccent.sql */
-
--- Adjust this setting to control where the objects get dropped.
-SET search_path = public;
-
-DROP FUNCTION unaccent(regdictionary, text);
-DROP FUNCTION unaccent(text);
-DROP TEXT SEARCH DICTIONARY unaccent;
-DROP TEXT SEARCH TEMPLATE unaccent;
-DROP FUNCTION unaccent_init(internal);
-DROP FUNCTION unaccent_lexize(internal,internal,internal,internal);