diff --git a/.gitignore b/.gitignore
index 8a9a6c9..1167d7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *.o
 *.so
 results
+/log/
diff --git a/meson.build b/meson.build
new file mode 100644
index 0000000..9dc5c8f
--- /dev/null
+++ b/meson.build
@@ -0,0 +1,37 @@
+# Copyright (c) 2025, Postgres Professional
+
+# Does not support the PGXS infrastructure at this time. Please, compile as part
+# of the contrib source tree.
+
+pg_tsparser_sources = files(
+  'tsparser.c'
+)
+
+if host_system == 'windows'
+  pg_tsparser_sources += rc_lib_gen.process(win32ver_rc, extra_args: [
+    '--NAME', 'pg_tsparser',
+    '--FILEDESC', 'pg_tsparser - modifies the default text parsing strategy.',])
+endif
+
+pg_tsparser = shared_module('pg_tsparser',
+  pg_tsparser_sources,
+  kwargs: contrib_mod_args,
+)
+contrib_targets += pg_tsparser
+
+install_data(
+  'pg_tsparser.control',
+  'pg_tsparser--1.0.sql',
+  kwargs: contrib_data_args,
+)
+
+tests += {
+  'name': 'pg_tsparser',
+  'sd': meson.current_source_dir(),
+  'bd': meson.current_build_dir(),
+  'regress': {
+    'sql': [
+      'pg_tsparser',
+    ],
+  },
+}
diff --git a/tsparser.c b/tsparser.c
index 53ff6ac..e821dce 100644
--- a/tsparser.c
+++ b/tsparser.c
@@ -269,6 +269,10 @@ typedef struct TParser
 	int			type;
 } TParser;
 
+#if PG_VERSION_NUM < 120000
+#define pg_strtoint32(value)	pg_atoi((value), sizeof(int32), 0)
+#endif
+
 
 /* forward decls here */
 static bool TParserGet(TParser *prs);
@@ -305,11 +309,14 @@ TParserInit(char *str, int len)
 	 */
 	if (prs->charmaxlen > 1)
 	{
-		Oid			collation = DEFAULT_COLLATION_OID;	/* TODO */
 		pg_locale_t mylocale = 0;		/* TODO */
 
 		prs->usewide = true;
-		if (lc_ctype_is_c(collation))
+#if PG_VERSION_NUM >= 150000 || (defined(PGPRO_STD) && PG_VERSION_NUM >= 120000)
+		if (database_ctype_is_c)
+#else
+		if (lc_ctype_is_c(DEFAULT_COLLATION_OID))
+#endif
 		{
 			/*
 			 * char2wchar doesn't work for C-locale and sizeof(pg_wchar) could
@@ -1973,7 +1980,11 @@ typedef struct
 #undef USE_PHRASE_SEARCH
 #endif
 
+#if PG_VERSION_NUM >= 130000 
+static TSTernaryValue
+#else
 static bool
+#endif
 #ifdef USE_PHRASE_SEARCH
 checkcondition_HL(void *opaque, QueryOperand *val, ExecPhraseData *data)
 #else
@@ -1990,7 +2001,11 @@ checkcondition_HL(void *opaque, QueryOperand *val)
 		{
 			/* don't need to find all positions */
 			if (!data)
+#if PG_VERSION_NUM >= 130000 
+				return TS_YES;
+#else
 				return true;
+#endif
 
 			if (!data->pos)
 			{
@@ -2005,17 +2020,29 @@ checkcondition_HL(void *opaque, QueryOperand *val)
 				data->pos[data->npos++] = checkval->words[i].pos;
 			}
 		}
+#else
+#if PG_VERSION_NUM >= 130000 
+			return TS_YES;
 #else
 			return true;
+#endif
 #endif
 	}
 
 #ifdef USE_PHRASE_SEARCH
 	if (data && data->npos > 0)
+#if PG_VERSION_NUM >= 130000 
+		return TS_YES;
+#else
 		return true;
 #endif
+#endif
 
+#if PG_VERSION_NUM >= 130000 
+	return TS_NO;
+#else
 	return false;
+#endif
 }
 
 
@@ -2513,13 +2540,13 @@ tsparser_headline(PG_FUNCTION_ARGS)
 		char	   *val = defGetString(defel);
 
 		if (pg_strcasecmp(defel->defname, "MaxWords") == 0)
-			max_words = pg_atoi(val, sizeof(int32), 0);
+			max_words = pg_strtoint32(val);
 		else if (pg_strcasecmp(defel->defname, "MinWords") == 0)
-			min_words = pg_atoi(val, sizeof(int32), 0);
+			min_words = pg_strtoint32(val);
 		else if (pg_strcasecmp(defel->defname, "ShortWord") == 0)
-			shortword = pg_atoi(val, sizeof(int32), 0);
+			shortword = pg_strtoint32(val);
 		else if (pg_strcasecmp(defel->defname, "MaxFragments") == 0)
-			max_fragments = pg_atoi(val, sizeof(int32), 0);
+			max_fragments = pg_strtoint32(val);
 		else if (pg_strcasecmp(defel->defname, "StartSel") == 0)
 			prs->startsel = pstrdup(val);
 		else if (pg_strcasecmp(defel->defname, "StopSel") == 0)