diff --git a/.cproject b/.cproject
deleted file mode 100644
index fb6d4f5..0000000
--- a/.cproject
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?fileVersion 4.0.0?>
-
-<cproject>
-<storageModule moduleId="org.eclipse.cdt.core.settings">
-<cconfiguration id="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.559665498">
-<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-<configuration buildProperties="" description="" id="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.559665498" name="Preference Configuration" parent="org.eclipse.cdt.build.core.prefbase.cfg">
-<folderInfo id="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.559665498." name="/" resourcePath="">
-<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.791538270" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
-<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.791538270.2138032099" name=""/>
-<builder id="org.eclipse.cdt.build.core.settings.default.builder.180913824" keepEnvironmentInBuildfile="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
-<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1257309815" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
-<tool id="org.eclipse.cdt.build.core.settings.holder.355300983" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
-<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.361331450" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
-</tool>
-<tool id="org.eclipse.cdt.build.core.settings.holder.1699606486" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
-<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1501910130" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
-</tool>
-<tool id="org.eclipse.cdt.build.core.settings.holder.1506443603" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">
-<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.227725182" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
-</tool>
-</toolChain>
-</folderInfo>
-</configuration>
-</storageModule>
-<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.559665498" moduleId="org.eclipse.cdt.core.settings" name="Preference Configuration">
-<externalSettings/>
-<extensions>
-<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-</extensions>
-</storageModule>
-<storageModule moduleId="scannerConfiguration"/>
-<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-</cconfiguration>
-</storageModule>
-<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-<project id="scim-tables.null.1808056573" name="scim-tables"/>
-</storageModule>
-</cproject>
diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 70f8318..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,22 +0,0 @@
- Makefile.in
- aclocal.m4
- autom4te.cache
- compile
- config.guess
- config.sub
- configure
- depcomp
- install-sh
- ltmain.sh
- missing
- Makefile
- config.h
- config.h.in
- config.log
- config.status
- intltool-extract
- intltool-merge
- intltool-update
- libtool
- scim-tables.spec
- stamp-h*
diff --git a/configure.ac b/configure.ac
index fa10323..bba57c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT([scim-tables], [0.5.14], [https://github.com/scim-im/scim-tables]) 
+AC_INIT([scim-tables], [0.5.14.1], [https://github.com/scim-im/scim-tables]) 
 # do not forget to edit skim/configure.in.in to change the version
 AC_CONFIG_SRCDIR([src/scim_table_imengine.h])
 
diff --git a/debian/changelog b/debian/changelog
index 49eee56..586edba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+scim-tables (0.5.14.1-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Drop patch scim_table_imengine_setup.cpp.patch, present upstream.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Sun, 15 May 2022 17:26:06 -0000
+
 scim-tables (0.5.14-1) unstable; urgency=medium
 
   [ Tz-Huan Huang ]
diff --git a/debian/patches/scim_table_imengine_setup.cpp.patch b/debian/patches/scim_table_imengine_setup.cpp.patch
deleted file mode 100644
index 16129ec..0000000
--- a/debian/patches/scim_table_imengine_setup.cpp.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Author: Tz-Huan Huang
-Subject: fix FTBFS
-
-backport upstream commit 31d48f8c2f2c50b
-
-diff --git a/src/scim_table_imengine_setup.cpp b/src/scim_table_imengine_setup.cpp
-index b99389b..4b5ec1b 100644
---- a/src/scim_table_imengine_setup.cpp
-+++ b/src/scim_table_imengine_setup.cpp
-@@ -695,7 +695,7 @@ create_table_management_page ()
-     __widget_table_list_view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (__widget_table_list_model));
-     gtk_widget_show (__widget_table_list_view);
-     gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (__widget_table_list_view), TRUE);
--#if SCIM_TABLES_USE_GTK_TREE_VIEW_SET_RULES_HINT
-+#ifdef SCIM_TABLES_USE_GTK_TREE_VIEW_SET_RULES_HINT
-     gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (__widget_table_list_view), TRUE);
- #endif
-     gtk_container_add (GTK_CONTAINER (scrolledwindow), __widget_table_list_view);
diff --git a/debian/patches/series b/debian/patches/series
index 6a63b21..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-scim_table_imengine_setup.cpp.patch
diff --git a/docs/.cvsignore b/docs/.cvsignore
deleted file mode 100644
index ee8c2d4..0000000
--- a/docs/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
- Makefile
- Makefile.in
- *.lo
- *.la
- .deps
- .libs
- scim-make-table
diff --git a/icons/.cvsignore b/icons/.cvsignore
deleted file mode 100644
index 282522d..0000000
--- a/icons/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/po/.cvsignore b/po/.cvsignore
deleted file mode 100644
index 5162d88..0000000
--- a/po/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
- Makefile
- Makefile.in
- POTFILES
- *.gmo
- stamp-po
-remove-potcdate.sed
diff --git a/skim/.cvsignore b/skim/.cvsignore
deleted file mode 100644
index 5be745a..0000000
--- a/skim/.cvsignore
+++ /dev/null
@@ -1,22 +0,0 @@
-ABOUT-NLS
-COPYING
-ChangeLog
-INSTALL
-Makefile
-Makefile.in
-NEWS
-acinclude.m4
-aclocal.m4
-autom4te.cache
-config.h
-config.h.in
-config.log
-config.status
-configure
-configure.files
-configure.in
-libtool
-stamp-h.in
-stamp-h1
-subdirs
-admin
diff --git a/skim/icons/.cvsignore b/skim/icons/.cvsignore
deleted file mode 100644
index 282522d..0000000
--- a/skim/icons/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/skim/po/.cvsignore b/skim/po/.cvsignore
deleted file mode 100644
index 52b2991..0000000
--- a/skim/po/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-Makefile.in
-*.gmo
diff --git a/skim/setupui/.cvsignore b/skim/setupui/.cvsignore
deleted file mode 100644
index 9db4153..0000000
--- a/skim/setupui/.cvsignore
+++ /dev/null
@@ -1,11 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo
-*.moc
-generictable.cpp
-generictable.h
-generictableui.cpp
-generictableui.h
diff --git a/src/.cvsignore b/src/.cvsignore
deleted file mode 100644
index ee8c2d4..0000000
--- a/src/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
- Makefile
- Makefile.in
- *.lo
- *.la
- .deps
- .libs
- scim-make-table
diff --git a/src/scim_table_imengine_setup.cpp b/src/scim_table_imengine_setup.cpp
index b99389b..4b5ec1b 100644
--- a/src/scim_table_imengine_setup.cpp
+++ b/src/scim_table_imengine_setup.cpp
@@ -695,7 +695,7 @@ create_table_management_page ()
     __widget_table_list_view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (__widget_table_list_model));
     gtk_widget_show (__widget_table_list_view);
     gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (__widget_table_list_view), TRUE);
-#if SCIM_TABLES_USE_GTK_TREE_VIEW_SET_RULES_HINT
+#ifdef SCIM_TABLES_USE_GTK_TREE_VIEW_SET_RULES_HINT
     gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (__widget_table_list_view), TRUE);
 #endif
     gtk_container_add (GTK_CONTAINER (scrolledwindow), __widget_table_list_view);
diff --git a/tables/.cvsignore b/tables/.cvsignore
deleted file mode 100644
index 2cd08d3..0000000
--- a/tables/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.txt
-*.bin
-Makefile
-Makefile.in
diff --git a/tables/additional/.cvsignore b/tables/additional/.cvsignore
deleted file mode 100644
index 2cd08d3..0000000
--- a/tables/additional/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.txt
-*.bin
-Makefile
-Makefile.in
diff --git a/tables/am/.cvsignore b/tables/am/.cvsignore
deleted file mode 100644
index 2cd08d3..0000000
--- a/tables/am/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.txt
-*.bin
-Makefile
-Makefile.in
diff --git a/tables/ar/.cvsignore b/tables/ar/.cvsignore
deleted file mode 100644
index 2cd08d3..0000000
--- a/tables/ar/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.txt
-*.bin
-Makefile
-Makefile.in
diff --git a/tables/bn/.cvsignore b/tables/bn/.cvsignore
deleted file mode 100644
index 2cd08d3..0000000
--- a/tables/bn/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.txt
-*.bin
-Makefile
-Makefile.in
diff --git a/tables/gu/.cvsignore b/tables/gu/.cvsignore
deleted file mode 100644
index 2cd08d3..0000000
--- a/tables/gu/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.txt
-*.bin
-Makefile
-Makefile.in
diff --git a/tables/hi/.cvsignore b/tables/hi/.cvsignore
deleted file mode 100644
index 2cd08d3..0000000
--- a/tables/hi/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.txt
-*.bin
-Makefile
-Makefile.in
diff --git a/tables/ja/.cvsignore b/tables/ja/.cvsignore
deleted file mode 100644
index 2cd08d3..0000000
--- a/tables/ja/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.txt
-*.bin
-Makefile
-Makefile.in
diff --git a/tables/kn/.cvsignore b/tables/kn/.cvsignore
deleted file mode 100644
index 2cd08d3..0000000
--- a/tables/kn/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.txt
-*.bin
-Makefile
-Makefile.in
diff --git a/tables/ko/.cvsignore b/tables/ko/.cvsignore
deleted file mode 100644
index 2cd08d3..0000000
--- a/tables/ko/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.txt
-*.bin
-Makefile
-Makefile.in
diff --git a/tables/ml/.cvsignore b/tables/ml/.cvsignore
deleted file mode 100644
index 2cd08d3..0000000
--- a/tables/ml/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.txt
-*.bin
-Makefile
-Makefile.in
diff --git a/tables/ta/.cvsignore b/tables/ta/.cvsignore
deleted file mode 100644
index 2cd08d3..0000000
--- a/tables/ta/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.txt
-*.bin
-Makefile
-Makefile.in
diff --git a/tables/te/.cvsignore b/tables/te/.cvsignore
deleted file mode 100644
index 2cd08d3..0000000
--- a/tables/te/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.txt
-*.bin
-Makefile
-Makefile.in
diff --git a/tables/th/.cvsignore b/tables/th/.cvsignore
deleted file mode 100644
index 2cd08d3..0000000
--- a/tables/th/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.txt
-*.bin
-Makefile
-Makefile.in
diff --git a/tables/vi/.cvsignore b/tables/vi/.cvsignore
deleted file mode 100644
index 2cd08d3..0000000
--- a/tables/vi/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.txt
-*.bin
-Makefile
-Makefile.in
diff --git a/tables/zh/.cvsignore b/tables/zh/.cvsignore
deleted file mode 100644
index 2cd08d3..0000000
--- a/tables/zh/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.txt
-*.bin
-Makefile
-Makefile.in