diff --git a/Makefile.in b/Makefile.in
index 88759bf2..8a2fb10a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,7 +9,10 @@ MODULE_big = repmgr
 
 EXTENSION = repmgr
 
-DATA = repmgr--4.0.sql
+DATA = \
+  repmgr--unpackaged--4.0.sql \
+  repmgr--4.0.sql
+
 
 # Hacky workaround to install the binaries
 SCRIPTS_built = repmgr repmgrd
diff --git a/repmgr--unpackaged--4.0.sql b/repmgr--unpackaged--4.0.sql
new file mode 100644
index 00000000..b52c6c7a
--- /dev/null
+++ b/repmgr--unpackaged--4.0.sql
@@ -0,0 +1,127 @@
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+-- \echo Use "CREATE EXTENSION repmgr" to load this file. \quit
+
+-- extract the current schema name
+-- NOTE: this assumes there will be only one schema matching 'repmgr_%';
+-- user is responsible for ensuring this is the case
+
+CREATE TEMPORARY TABLE repmgr_old_schema (old_schema TEXT);
+INSERT INTO repmgr_old_schema (old_schema)
+SELECT nspname AS old_schema
+  FROM pg_catalog.pg_namespace
+ WHERE nspname LIKE 'repmgr_%'
+ LIMIT 1;
+
+DO $$
+DECLARE
+  old_schema TEXT;
+BEGIN
+  old_schema := SELECT old_schema FROM repmgr_old_schema;
+  ALTER SCHEMA  RENAME TO repmgr;
+END$$;
+
+-- convert "repmgr_$cluster.repl_nodes" to "repmgr.nodes"
+CREATE TABLE nodes (
+  node_id          INTEGER     PRIMARY KEY,
+  upstream_node_id INTEGER     NULL REFERENCES nodes (node_id) DEFERRABLE,
+  active           BOOLEAN     NOT NULL DEFAULT TRUE,
+  node_name        TEXT        NOT NULL,
+  type             TEXT        NOT NULL CHECK (type IN('primary','standby','bdr')),
+  location         TEXT        NOT NULL DEFAULT 'default',
+  priority         INT         NOT NULL DEFAULT 100,
+  conninfo         TEXT        NOT NULL,
+  repluser         VARCHAR(63) NOT NULL,
+  slot_name        TEXT        NULL,
+  config_file      TEXT        NOT NULL
+);
+
+INSERT INTO nodes
+  (node_id, upstream_node_id, active, node_name, type, location, priority, conninfo, repluser, slot_name, config_file)
+SELECT id, upstream_node_id, active, name,
+       CASE WHEN type = 'master' THEN 'primary' ELSE type END,
+       'default', priority, conninfo, 'unknown', slot_name, 'unknown'
+  FROM repl_nodes
+ ORDER BY id;
+
+
+-- convert "repmgr_$cluster.repl_event" to "repmgr.event"
+
+ALTER TABLE repl_events RENAME TO event;
+
+-- convert "repmgr_$cluster.repl_monitor" to "repmgr.monitor"
+
+ALTER TABLE repl_monitor RENAME TO monitor;
+
+-- recreate VIEW
+
+DROP VIEW IF EXISTS repl_show_nodes;
+
+CREATE VIEW show_nodes AS
+   SELECT n.node_id,
+          n.node_name,
+          n.active,
+          n.upstream_node_id,
+          un.node_name AS upstream_node_name,
+          n.type,
+          n.priority,
+          n.conninfo
+     FROM nodes n
+LEFT JOIN nodes un
+       ON un.node_id = n.upstream_node_id;
+
+DROP VIEW IF EXISTS repl_status;
+
+-- CREATE VIEW status ... ;
+
+DROP TABLE repl_nodes;
+
+
+/* repmgrd functions */
+
+CREATE FUNCTION request_vote(INT,INT)
+  RETURNS pg_lsn
+  AS '$libdir/repmgr', 'request_vote'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_voting_status()
+  RETURNS INT
+  AS '$libdir/repmgr', 'get_voting_status'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION set_voting_status_initiated()
+  RETURNS INT
+  AS '$libdir/repmgr', 'set_voting_status_initiated'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION other_node_is_candidate(INT, INT)
+  RETURNS BOOL
+  AS '$libdir/repmgr', 'other_node_is_candidate'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION notify_follow_primary(INT)
+  RETURNS VOID
+  AS '$libdir/repmgr', 'notify_follow_primary'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION get_new_primary()
+  RETURNS INT
+  AS '$libdir/repmgr', 'get_new_primary'
+  LANGUAGE C STRICT;
+
+CREATE FUNCTION reset_voting_status()
+  RETURNS VOID
+  AS '$libdir/repmgr', 'reset_voting_status'
+  LANGUAGE C STRICT;
+
+
+CREATE FUNCTION am_bdr_failover_handler(INT)
+  RETURNS BOOL
+  AS '$libdir/repmgr', 'am_bdr_failover_handler'
+  LANGUAGE C STRICT;
+
+
+CREATE FUNCTION unset_bdr_failover_handler()
+  RETURNS VOID
+  AS '$libdir/repmgr', 'unset_bdr_failover_handler'
+  LANGUAGE C STRICT;
+