diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..63b45bed
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+# Set the default behavior to unix line endings, required by perl code
+* text eol=lf
\ No newline at end of file
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 00000000..2d01d71c
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,13 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+
+ # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "monthly"
diff --git a/.github/workflows/CI_build.yml b/.github/workflows/CI_build.yml
new file mode 100644
index 00000000..65c33165
--- /dev/null
+++ b/.github/workflows/CI_build.yml
@@ -0,0 +1,106 @@
+name: CI_build
+
+on: [push, pull_request]
+
+jobs:
+
+  build_windows_msys2:
+
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        build_configuration: [Release, Debug]
+        build_platform: [x86_64, i686]
+
+    steps:
+    - name: Checkout repo
+      uses: actions/checkout@v4
+
+    - name: Make aspell exe
+      working-directory: .\
+      run: |
+        Write-host "${{ matrix.build_platform }}"
+        Write-host "${{ matrix.build_configuration }}"
+        $Env:Path = 'C:\msys64\usr\bin' + [IO.Path]::PathSeparator + $Env:Path
+        if ( $${{ matrix.build_platform == 'i686'}} ) {$Env:MSYSTEM = 'MINGW32'}
+        if ( $${{ matrix.build_platform == 'i686'}} ) {$Env:Path = 'C:\msys64\mingw32\bin' + [IO.Path]::PathSeparator + $Env:Path}
+        if ( $${{ matrix.build_platform == 'x86_64'}} ) {$Env:MSYSTEM = 'MINGW64'}
+        if ( $${{ matrix.build_platform == 'x86_64'}} ) {$Env:Path = 'C:\msys64\mingw64\bin' + [IO.Path]::PathSeparator + $Env:Path}
+        if ( $${{ matrix.build_configuration == 'Debug'}} ) {$Env:DEBUG = '1'}
+        bash -lc "pacman --noconfirm -Syuu"
+        bash -lc "pacman --noconfirm -Syuu"
+        if ( $${{ matrix.build_platform == 'i686'}} ) {bash -lc "pacman --noconfirm -S mingw-w64-i686-gcc mingw-w64-i686-make"}
+        if ( $${{ matrix.build_platform == 'x86_64'}} ) {bash -lc "pacman --noconfirm -S mingw-w64-x86_64-gcc mingw-w64-x86_64-make"}
+        Write-Output "Tools version:"
+        Write-Output (((gcc --version) | select-object -first 1) + " " + (gcc -dumpmachine))
+        Write-Output (mingw32-make --version) | select-object -first 1
+        Write-Output (sh --version) | select-object -first 1
+        cd auto
+        perl -I ./ mk-src.pl
+        cd ../win32
+        mingw32-make
+        mingw32-make prefix=./installation install
+
+    - name: Archive artifacts for ${{ matrix.build_platform}} / Release
+      if: matrix.build_configuration == 'Release'
+      uses: actions/upload-artifact@v4
+      with:
+          name: aspell_win.${{ matrix.build_platform}}.${{ matrix.build_configuration}}
+          path: aspell.exe
+
+
+  build_linux:
+
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        build_platform: ["x86_64", i686]
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Prepare generated files
+      working-directory: ./auto
+      run: |
+           perl -I ./ mk-src.pl
+
+    - name: Install packages via apt
+      run: |
+           sudo apt-get -qq update
+           sudo apt-get -qq install -y mingw-w64
+           (for alt in i686-w64-mingw32-g++ i686-w64-mingw32-gcc x86_64-w64-mingw32-g++ x86_64-w64-mingw32-gcc; do sudo update-alternatives --set $alt /usr/bin/$alt-posix; done);
+
+    - name: build make mingw
+      working-directory: ./win32
+      run: |
+           export PATH=/usr/bin/${{ matrix.build_platform }}-w64-mingw32-gcc/bin:/usr/bin/${{ matrix.build_platform }}-w64-mingw32-g++/bin:$PATH
+           ${{ matrix.build_platform }}-w64-mingw32-g++ --version
+           make TARGET=${{ matrix.build_platform }}-w64-mingw32-
+           make TARGET=${{ matrix.build_platform }}-w64-mingw32- prefix=./installation install
+
+
+  build_linux_native:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Install packages via apt
+      run: |
+           sudo apt-get -y update
+           sudo apt-get -y install make autopoint texinfo libtool intltool bzip2 gettext g++-multilib g++-9 g++-10 g++-11 g++-12 clang-11 clang-12 clang-13 clang-14 clang-15
+           sudo apt-get -y purge aspell
+
+    - name: build
+      working-directory: ./
+      run: |
+           ./autogen
+           ./sanity-check.sh
+           CXX="g++ -m32" CC="gcc -m32" ./sanity-check.sh
+           CXX=g++-9 CC=gcc-9 ./sanity-check.sh
+           CXX=g++-10 CC=gcc-10 ./sanity-check.sh
+           CXX=clang++-15 CC=clang-15 ./sanity-check.sh
+           ./config-opt && make -C build -j2
\ No newline at end of file
diff --git a/common/file_util.cpp b/common/file_util.cpp
index 56ea5010..a0a0ba2a 100644
--- a/common/file_util.cpp
+++ b/common/file_util.cpp
@@ -13,6 +13,7 @@
 #include "fstream.hpp"
 #include "errors.hpp"
 #include "string_list.hpp"
+#include "asc_ctype.hpp"
 
 #ifdef USE_FILE_LOCKS
 #  include <fcntl.h>
diff --git a/common/lock.hpp b/common/lock.hpp
index 1090f5ad..77bdc78f 100644
--- a/common/lock.hpp
+++ b/common/lock.hpp
@@ -16,6 +16,7 @@
 #define DISTRIBNET_LOCK__HPP
 
 #include <assert.h>
+#include <cstddef>
 
 #include "settings.h"
 
diff --git a/win32/Makefile b/win32/Makefile
index 6836907c..25949321 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -62,12 +62,12 @@ ifdef WIN32_RELOCATABLE
 endif
 
 # cygwin: built native w32 code
-NOCYGWIN=-mno-cygwin
+#NOCYGWIN=-mno-cygwin
 
 ################################################################################
 
 LIBVERSION=15
-ASPELLVERSION=0-50-3
+ASPELLVERSION=0-60-8-1
 
 CCOMPILER=gcc
 CPPCOMPILER=g++
@@ -88,6 +88,8 @@ VPATH=	$(top_srcdir)/common:\
 	$(top_srcdir)/modules/speller/default:\
 	$(top_srcdir)/modules/tokenizer:\
 	$(top_srcdir)/lib:\
+	$(top_srcdir)/gen:\
+	$(top_srcdir)/win32/gen:\
 	$(top_srcdir)/prog
 INCLUDES = \
 	-I. \
@@ -96,6 +98,9 @@ INCLUDES = \
 	-I$(top_srcdir)/modules/filter \
 	-I$(top_srcdir)/modules/speller/default \
 	-I$(top_srcdir)/modules/tokenizer \
+	-I$(top_srcdir)/gen \
+	-I$(top_srcdir)/win32 \
+	-I$(top_srcdir)/win32/gen \
 	$(CURSES_INCLUDE)
 
 FLAGS=$(DEBUGFLAG) $(BITFIELD) $(NOCYGWIN) $(OPTIMIZATION)
@@ -139,14 +144,15 @@ clean: \
 ASPELL_COMMON_A_NAME=aspell-common-$(ASPELLVERSION).a
 
 aspell_common_OBJECTS = \
+	cache.o \
 	string.o \
 	getdata.o \
 	itemize.o \
 	file_util.o \
-	string_buffer.o \
 	string_map.o \
 	string_list.o \
 	config.o \
+	version.o \
 	posib_err.o \
 	errors.o \
 	error.o \
@@ -159,16 +165,21 @@ aspell_common_OBJECTS = \
 	speller.o \
 	document_checker.o \
 	filter.o \
-	strtonum.o
+	objstack.o \
+	strtonum.o \
+	gettext_init.o \
+	file_data_util.o
 
+
+cache.o:	cache.cpp
 string.o:	string.cpp
 getdata.o:	getdata.cpp
 itemize.o:	itemize.cpp
 file_util.o:	file_util.cpp
-string_buffer.o:	string_buffer.cpp
 string_map.o:	string_map.cpp
 string_list.o:	string_list.cpp
 config.o:	config.cpp
+version.o:	version.cpp
 posib_err.o:	posib_err.cpp
 errors.o:	errors.cpp
 error.o:	error.cpp
@@ -181,29 +192,26 @@ tokenizer.o:	tokenizer.cpp
 speller.o:	speller.cpp
 document_checker.o:	document_checker.cpp
 filter.o:	filter.cpp
+objstack.o:	objstack.cpp
 strtonum.o:	strtonum.cpp
+gettext_init.o:	gettext_init.cpp
+file_data_util.o:	file_data_util.cpp
 
-dirs.h: mk-dirs_h
-	echo '#define PREFIX "${prefix}"'            >  dirs.h
-	./mk-dirs_h ${prefix} DICT_DIR ${pkglibdir}  >> dirs.h
-	./mk-dirs_h ${prefix} DATA_DIR ${pkgdatadir} >> dirs.h
-	./mk-dirs_h ${prefix} CONF_DIR ${sysconfdir} >> dirs.h
 
-mk-dirs_h: mk-dirs_h.cpp
-	$(NATIVE_CXX) $< $(LIBS) -o $@
+gen/dirs.h:
+	perl ${top_srcdir}/gen/mk-dirs_h.pl ${prefix} ${pkgdatadir} ${pkglibdir}  ${sysconfdir} >  ${top_srcdir}/gen/dirs.h
 
-config.cpp: dirs.h
+${top_srcdir}/common/config.cpp: gen/dirs.h
 
 aspell_common_a: $(ASPELL_COMMON_A_NAME) 
-$(ASPELL_COMMON_A_NAME): dirs.h $(aspell_common_OBJECTS)
+$(ASPELL_COMMON_A_NAME): gen/dirs.h $(aspell_common_OBJECTS)
 	$(AR) $(ARFLAGS) \
 	$@ \
 	$(aspell_common_OBJECTS)
 aspell_common_clean:
 	-rm $(aspell_common_OBJECTS) \
 	$(ASPELL_COMMON_A_NAME) \
-	mk-dirs_h.exe mk-dirs_h \
-	dirs.h
+	${top_srcdir}/gen/dirs.h
 
 #######################################################################
 # {{{1	aspell-filter-standard
@@ -213,15 +221,21 @@ aspell_filter_standard_EXTRALIBS = \
 	$(ASPELL_COMMON_A_NAME)
 
 aspell_filter_standard_OBJECTS = \
-	email.o \
 	url.o \
+	email.o \
 	tex.o \
 	sgml.o \
+	context.o \
+	nroff.o \
+	texinfo.o \
 
-email.o:	email.cpp
 url.o:	url.cpp
+email.o:	email.cpp
 tex.o:	tex.cpp
 sgml.o:	sgml.cpp
+context.o:	context.cpp
+nroff.o:	nroff.cpp
+texinfo.o:	texinfo.cpp
 
 aspell_filter_standard_a: $(ASPELL_FILTER_STANDARD_A_NAME)
 $(ASPELL_FILTER_STANDARD_A_NAME): $(aspell_filter_standard_OBJECTS)
@@ -240,43 +254,35 @@ aspell_speller_default_EXTRALIBS = \
 	$(ASPELL_COMMON_A_NAME)
 
 aspell_speller_default_OBJECTS = \
-	data.o \
-	leditdist.o \
-	primes.o \
-	writable_base.o \
-	editdist.o \
-	speller_impl.o \
 	readonly_ws.o \
-	writable_repl.o \
-	file_data_util.o \
-	multi_ws.o \
-	split.o \
-	writable_ws.o \
-	l2editdist.o \
-	phonet.o \
 	suggest.o \
-	language.o \
+	data.o \
+	multi_ws.o \
 	phonetic.o \
+	writable.o \
+	speller_impl.o \
+	phonet.o \
 	typo_editdist.o \
+	editdist.o \
+	primes.o \
+	language.o \
+	leditdist.o \
+	affix.o \
 
-data.o:	data.cpp
-leditdist.o:	leditdist.cpp
-primes.o:	primes.cpp
-writable_base.o:	writable_base.cpp
-editdist.o:	editdist.cpp
-speller_impl.o:	speller_impl.cpp
 readonly_ws.o:	readonly_ws.cpp
-writable_repl.o:	writable_repl.cpp
-file_data_util.o:	file_data_util.cpp
-multi_ws.o:	multi_ws.cpp
-split.o:	split.cpp
-writable_ws.o:	writable_ws.cpp
-l2editdist.o:	l2editdist.cpp
-phonet.o:	phonet.cpp
 suggest.o:	suggest.cpp
-language.o:	language.cpp
+data.o:	data.cpp
+multi_ws.o:	multi_ws.cpp
 phonetic.o:	phonetic.cpp
+writable.o:	writable.cpp
+speller_impl.o:	speller_impl.cpp
+phonet.o:	phonet.cpp
 typo_editdist.o:	typo_editdist.cpp
+editdist.o:	editdist.cpp
+primes.o:	primes.cpp
+language.o:	language.cpp
+leditdist.o:	leditdist.cpp
+affix.o:	affix.cpp
 
 aspell_speller_default_a: $(ASPELL_SPELLER_DEFAULT_A_NAME)
 $(ASPELL_SPELLER_DEFAULT_A_NAME): $(aspell_speller_default_OBJECTS)
@@ -338,34 +344,58 @@ aspell_dll_OBJECTS = \
 	string_pair_enumeration-c.o \
 	find_speller.o \
 	new_checker.o \
-	new_filter.o \
 	new_config.o \
 	string_enumeration-c.o \
 	word_list-c.o \
 	filter-c.o \
 	document_checker-c.o \
+	new_filter.o \
+	new_fmode.o \
 
-can_have_error-c.o:	can_have_error-c.cpp
+filter-c.o:	filter-c.cpp
+word_list-c.o:	word_list-c.cpp
 info-c.o:	info-c.cpp
-string_list-c.o:	string_list-c.cpp
+mutable_container-c.o:	mutable_container-c.cpp
+error-c.o:	error-c.cpp
+document_checker-c.o:	document_checker-c.cpp
+string_map-c.o:	string_map-c.cpp
+new_config.o:	new_config.cpp
 config-c.o:	config-c.cpp
+string_enumeration-c.o:	string_enumeration-c.cpp
+can_have_error-c.o:	can_have_error-c.cpp
+new_filter.o:	new_filter.cpp
+new_fmode.o:	new_fmode.cpp
+string_list-c.o:	string_list-c.cpp
+find_speller.o:	find_speller.cpp
 speller-c.o:	speller-c.cpp
-string_map-c.o:	string_map-c.cpp
-error-c.o:	error-c.cpp
-mutable_container-c.o:	mutable_container-c.cpp
 string_pair_enumeration-c.o:	string_pair_enumeration-c.cpp
-find_speller.o:	find_speller.cpp
 new_checker.o:	new_checker.cpp
-new_filter.o:	new_filter.cpp
-new_config.o:	new_config.cpp
-string_enumeration-c.o:	string_enumeration-c.cpp
-word_list-c.o:	word_list-c.cpp
-filter-c.o:	filter-c.cpp
-document_checker-c.o:	document_checker-c.cpp
+
+static_optfiles = ${top_srcdir}/modules/filter/url-filter.info
+
+### Add the .info file your filter comes with
+optfiles = \
+  ${top_srcdir}/modules/filter/email-filter.info\
+  ${top_srcdir}/modules/filter/tex-filter.info\
+  ${top_srcdir}/modules/filter/sgml-filter.info\
+  ${top_srcdir}/modules/filter/html-filter.info\
+  ${top_srcdir}/modules/filter/context-filter.info\
+  ${top_srcdir}/modules/filter/nroff-filter.info\
+  ${top_srcdir}/modules/filter/texinfo-filter.info
+
+static_optfiles += ${optfiles}
+
+# settings.h added as a dependency so it will get recreated if
+#   the COMPILE_IN_FILTERS option changes
+win32/gen/static_filters.src.cpp: ${static_optfiles} ${top_srcdir}/gen/mk-static-filter.pl
+	perl ${top_srcdir}/gen/mk-static-filter.pl ${static_optfiles}
+
+${top_srcdir}/lib/new_filter.cpp: win32/gen/static_filters.src.cpp
+
 
 aspell_dll: $(ASPELL_DLL_NAME)
 $(ASPELL_DLL_NAME): $(aspell_dll_OBJECTS)
-	$(CC) $(FLAGS) \
+	$(CXX) $(FLAGS) \
 	-shared \
 	$(aspell_dll_LDFLAGS) \
 	$+ \
@@ -375,7 +405,8 @@ aspell_dll_clean:
 	-rm $(aspell_dll_OBJECTS) \
 	$(ASPELL_DLL_NAME) \
 	$(ASPELL_DLL_LIB_NAME) \
-	$(ASPELL_DLL_DEF_NAME)
+	$(ASPELL_DLL_DEF_NAME) \
+	${top_srcdir}/gen/static_filters.src.cpp
 
 ################################################################################
 # {{{1	pspell-dll
@@ -395,7 +426,7 @@ dummy.o:	dummy.cpp
 
 pspell_dll: $(PSPELL_DLL_NAME)
 $(PSPELL_DLL_NAME): $(pspell_dll_OBJECTS)
-	$(CC) $(FLAGS) \
+	$(CXX) $(FLAGS) \
 	-shared \
 	$(pspell_dll_LDFLAGS) \
 	$+ \
@@ -426,7 +457,7 @@ checker_string.o:	checker_string.cpp
 
 aspell_exe: $(ASPELL_EXE_NAME)
 $(ASPELL_EXE_NAME): $(aspell_exe_OBJECTS)
-	$(CC) $(FLAGS) \
+	$(CXX) $(FLAGS) \
 	$+ \
 	$(aspell_exe_EXTRALIBS) \
 	$(CURSES_LIB) \
@@ -446,7 +477,7 @@ compress.o:	compress.c
 
 word_list_compress_exe: $(WORD_LIST_COMPRESS_EXE_NAME)
 $(WORD_LIST_COMPRESS_EXE_NAME): $(word_list_compress_OBJECTS)
-	$(CC) $(FLAGS) \
+	$(CXX) $(FLAGS) \
 	$+ \
 	$(LIBS) -o $@
 word_list_compress_clean:
@@ -492,15 +523,16 @@ regfile_clean:
 	-rm $(REGFILE_NAME)
 install: regfile
 	-mkdir $(installdir)
-	-mkdir $(installdir)/$(pkglibdir)
-	-mkdir $(installdir)/$(pkgdatadir)
+	-mkdir $(pkglibdir)
+	-mkdir $(pkgdatadir)
 	-cp  $(WORD_LIST_COMPRESS_EXE_NAME) \
 	    $(ASPELL_EXE_NAME) \
 	    $(PSPELL_DLL_NAME) \
 	    $(ASPELL_DLL_NAME) \
 	    $(installdir)
-	-cp $(top_srcdir)/data/*.dat $(installdir)/$(pkgdatadir)
-	-cp $(top_srcdir)/data/*.kbd $(installdir)/$(pkgdatadir)
+	-cp $(top_srcdir)/data/*.cmap $(pkgdatadir)
+	-cp $(top_srcdir)/data/*.cset $(pkgdatadir)
+	-cp $(top_srcdir)/data/*.kbd $(pkgdatadir)
 	-cp $(REGFILE_NAME) $(installdir)
 	
 
diff --git a/win32/gen/static_filters.src.cpp b/win32/gen/static_filters.src.cpp
new file mode 100644
index 00000000..e69de29b
diff --git a/win32/settings.h b/win32/settings.h
index 33a30fb4..e29a4edd 100644
--- a/win32/settings.h
+++ b/win32/settings.h
@@ -89,4 +89,6 @@
 /* #undef USE_LOCALE */
 
 /* Version number of package */
-#define VERSION "0.50.3"
+#define VERSION "0.60.8.1"
+
+#define C_EXPORT extern "C"